Browse Source

Refactor rendermime plugin to have token and interface defined in implementation instead of in plugin.

Afshin Darian 8 years ago
parent
commit
dc3e09dd27
5 changed files with 18 additions and 25 deletions
  1. 1 1
      src/console/plugin.ts
  2. 1 1
      src/markdownwidget/plugin.ts
  3. 1 1
      src/notebook/plugin.ts
  4. 13 0
      src/rendermime/index.ts
  5. 2 22
      src/rendermime/plugin.ts

+ 1 - 1
src/console/plugin.ts

@@ -31,7 +31,7 @@ import {
 
 import {
   IRenderMime
-} from '../rendermime/plugin';
+} from '../rendermime';
 
 import {
   IServiceManager

+ 1 - 1
src/markdownwidget/plugin.ts

@@ -11,7 +11,7 @@ import {
 
 import {
   IRenderMime
-} from '../rendermime/plugin';
+} from '../rendermime';
 
 import {
   MarkdownWidgetFactory

+ 1 - 1
src/notebook/plugin.ts

@@ -32,7 +32,7 @@ import {
 
 import {
   IRenderMime
-} from '../rendermime/plugin';
+} from '../rendermime';
 
 import {
   IServiceManager

+ 13 - 0
src/rendermime/index.ts

@@ -1,6 +1,10 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
+import {
+  Token
+} from 'phosphor/lib/core/token';
+
 import {
   Widget
 } from 'phosphor/lib/ui/widget';
@@ -10,6 +14,15 @@ import {
 } from '../sanitizer';
 
 
+/* tslint:disable */
+/**
+ * The rendermime token.
+ */
+export
+const IRenderMime = new Token<IRenderMime>('jupyter.services.rendermime');
+/* tslint:enable */
+
+
 /**
  * The rendermime interface.
  */

+ 2 - 22
src/rendermime/plugin.ts

@@ -1,10 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import {
-  Token
-} from 'phosphor/lib/core/token';
-
 import {
   JupyterLabPlugin
 } from '../application';
@@ -19,24 +15,8 @@ import {
 } from '../sanitizer';
 
 import {
-  IRenderMime as IBaseRenderMime, RenderMime
-} from './index';
-
-
-/* tslint:disable */
-/**
- * The rendermime token.
- */
-export
-const IRenderMime = new Token<IRenderMime>('jupyter.services.rendermime');
-/* tslint:enable */
-
-
-/**
- * The rendermime interface.
- */
-export
-interface IRenderMime extends IBaseRenderMime {}
+  IRenderMime, RenderMime
+} from './';
 
 
 /**