Chore: Move controllers into a separate folder (#18)

box · Nov 3, 2017 · 3efa19f · 3efa19f
1 parent b125b8b
commit 3efa19f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/BoxAnnotations.js b/src/BoxAnnotations.js
@@ -1,6 +1,6 @@
 import DocAnnotator from './doc/DocAnnotator';
 import ImageAnnotator from './image/ImageAnnotator';
-import DrawingModeController from './drawing/DrawingModeController';
+import DrawingModeController from './controllers/DrawingModeController';
 import { TYPES } from './annotationConstants';
 import { canLoadAnnotations } from './annotatorUtil';
 

diff --git a/src/__tests__/BoxAnnotations-test.js b/src/__tests__/BoxAnnotations-test.js
@@ -2,7 +2,7 @@
 import BoxAnnotations from '../BoxAnnotations';
 import { TYPES } from '../annotationConstants';
 import * as annotatorUtil from '../annotatorUtil';
-import DrawingModeController from '../drawing/DrawingModeController';
+import DrawingModeController from '../controllers/DrawingModeController';
 
 let loader;
 let stubs;
@@ -133,7 +133,7 @@ describe('BoxAnnotations', () => {
                 enabled: true,
                 disabledTypes: ['point']
             };
-            
+
             const docAnnotator = {
                 NAME: 'Document',
                 VIEWER: ['Document'],
@@ -153,7 +153,7 @@ describe('BoxAnnotations', () => {
             });
             expect(loader.getAnnotatorsForViewer).to.be.called;
         });
-        
+
         it('should filter and only keep allowed types of annotations', () => {
             const config = {
                 enabled: true,
@@ -166,7 +166,7 @@ describe('BoxAnnotations', () => {
                 TYPE: ['point', 'highlight', 'highlight-comment', 'draw'],
                 DEFAULT_TYPES: ['point', 'highlight']
             };
-            
+
             sandbox.stub(loader, 'getAnnotatorsForViewer').returns(docAnnotator);
             const annotator = loader.determineAnnotator(stubs.options, config);
             expect(annotator.TYPE.includes('point')).to.be.true;
@@ -192,7 +192,7 @@ describe('BoxAnnotations', () => {
             };
             sandbox.stub(loader, 'getAnnotatorsForViewer').returns(docAnnotator);
             const annotator = loader.determineAnnotator(stubs.options, config);
-            
+
             expect(annotator.TYPE).to.deep.equal(['point', 'draw']);
         });
     });

diff --git a/src/AnnotationModeController.js → src/controllers/AnnotationModeController.js b/src/AnnotationModeController.js → src/controllers/AnnotationModeController.js
@@ -1,5 +1,5 @@
 import EventEmitter from 'events';
-import { insertTemplate } from './annotatorUtil';
+import { insertTemplate } from '../annotatorUtil';
 
 class AnnotationModeController extends EventEmitter {
     /** @property {Object} - Object of annotation threads indexed by threadID */

diff --git a/src/drawing/DrawingModeController.js → src/controllers/DrawingModeController.js b/src/drawing/DrawingModeController.js → src/controllers/DrawingModeController.js
@@ -1,5 +1,5 @@
 import rbush from 'rbush';
-import AnnotationModeController from '../AnnotationModeController';
+import AnnotationModeController from './AnnotationModeController';
 import annotationsShell from './../annotationsShell.html';
 import DocDrawingThread from '../doc/DocDrawingThread';
 import * as annotatorUtil from '../annotatorUtil';

diff --git a/..._tests__/AnnotationModeController-test.js → ..._tests__/AnnotationModeController-test.js b/..._tests__/AnnotationModeController-test.js → ..._tests__/AnnotationModeController-test.js
@@ -1,12 +1,12 @@
 import AnnotationModeController from '../AnnotationModeController';
-import DocDrawingThread from '../doc/DocDrawingThread';
-import * as util from '../annotatorUtil';
+import DocDrawingThread from '../../doc/DocDrawingThread';
+import * as util from '../../annotatorUtil';
 
 let controller;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('AnnotationModeController', () => {
+describe('controllers/AnnotationModeController', () => {
     beforeEach(() => {
         controller = new AnnotationModeController();
         stubs = {};

diff --git a/...g/__tests__/DrawingModeController-test.js → ...s/__tests__/DrawingModeController-test.js b/...g/__tests__/DrawingModeController-test.js → ...s/__tests__/DrawingModeController-test.js
@@ -1,5 +1,5 @@
 import rbush from 'rbush';
-import AnnotationModeController from '../../AnnotationModeController';
+import AnnotationModeController from '../AnnotationModeController';
 import DrawingModeController from '../DrawingModeController';
 import * as annotatorUtil from '../../annotatorUtil';
 import { CLASS_ANNOTATION_DRAW} from '../../annotationConstants';
@@ -8,7 +8,7 @@ let controller;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('drawing/DrawingModeController', () => {
+describe('controllers/DrawingModeController', () => {
     beforeEach(() => {
         controller = new DrawingModeController();
         stubs = {};