Chore: Bundling annotations.css separately from preview.css (#106)

box · May 9, 2017 · 699ed56 · 699ed56
1 parent c735f38
commit 699ed56
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/src/lib/annotations/Annotator.js b/src/lib/annotations/Annotator.js
@@ -4,6 +4,7 @@ import Notification from '../Notification';
 import AnnotationService from './AnnotationService';
 import * as constants from './annotationConstants';
 import { CLASS_ACTIVE } from '../constants';
+import './Annotator.scss';
 
 @autobind
 class Annotator extends EventEmitter {

diff --git a/src/lib/viewers/BaseViewer.js b/src/lib/viewers/BaseViewer.js
@@ -26,6 +26,7 @@ import {
 } from '../constants';
 
 const ANNOTATIONS_JS = ['annotations.js'];
+const ANNOTATIONS_CSS = ['annotations.css'];
 const LOAD_TIMEOUT_MS = 180000; // 3m
 const RESIZE_WAIT_TIME_IN_MILLIS = 300;
 
@@ -74,7 +75,7 @@ class BaseViewer extends EventEmitter {
         // the assets are available, the showAnnotations flag is true, and the
         // expiring embed is not a shared link
         if (this.areAnnotationsEnabled() && !this.options.sharedLink) {
-            this.loadAssets(ANNOTATIONS_JS);
+            this.loadAssets(ANNOTATIONS_JS, ANNOTATIONS_CSS);
         }
     }
 

diff --git a/src/lib/viewers/doc/Document.scss b/src/lib/viewers/doc/Document.scss
@@ -1,4 +1,3 @@
-@import '../../annotations/Annotator';
 @import 'docBase';
 @import './DocFindBar';
 

diff --git a/src/lib/viewers/doc/Presentation.scss b/src/lib/viewers/doc/Presentation.scss
@@ -1,4 +1,3 @@
-@import '../../annotations/Annotator';
 @import 'docBase';
 @import './DocFindBar';
 

diff --git a/src/lib/viewers/image/Image.scss b/src/lib/viewers/image/Image.scss
@@ -1,5 +1,3 @@
-@import '../../annotations/Annotator';
-
 .bp-image {
     border: 0 none;
     bottom: 0;