Move save handler functionality to the document manager

src/docmanager/index.ts

@@ -2,3 +2,4 @@
 // Distributed under the terms of the Modified BSD License.
 
 export * from './manager';
+export * from './savehandler';

src/docmanager/manager.ts

@@ -21,6 +21,10 @@ import {
   IDisposable
 } from 'phosphor/lib/core/disposable';
 
+import {
+  AttachedProperty
+} from 'phosphor/lib/core/properties';
+
 import {
   Widget
 } from 'phosphor/lib/ui/widget';
@@ -29,6 +33,10 @@ import {
   DocumentRegistry, Context
 } from '../docregistry';
 
+import {
+  SaveHandler
+} from './savehandler';
+
 import {
   DocumentWidgetManager
 } from './widgetmanager';
@@ -269,6 +277,14 @@ class DocumentManager implements IDisposable {
       factory,
       path
     });
+    let handler = new SaveHandler({
+      context,
+      manager: this._serviceManager
+    });
+    Private.saveHandlerProperty.set(context, handler);
+    context.populated.connect(() => {
+      handler.start();
+    });
     context.disposed.connect(() => {
       this._contexts.remove(context);
     });
@@ -332,3 +348,17 @@ namespace DocumentManager {
     open(widget: Widget): void;
   }
 }
+
+
+/**
+ * A namespace for private data.
+ */
+namespace Private {
+  /**
+   * An attached property for a context save handler.
+   */
+  export
+  const saveHandlerProperty = new AttachedProperty<DocumentRegistry.IContext<DocumentRegistry.IModel>, SaveHandler>({
+    name: 'saveHandler'
+  });
+}

src/docregistry/index.ts

@@ -6,4 +6,3 @@ export * from './default';
 export * from './kernelactions';
 export * from './kernelselector';
 export * from './registry';
-export * from './savehandler';

test/src/docregistry/savehandler.spec.ts → test/src/docmanager/savehandler.spec.ts

@@ -8,9 +8,13 @@ import {
 } from '@jupyterlab/services';
 
 import {
-  Context, DocumentRegistry, TextModelFactory, SaveHandler
+  Context, DocumentRegistry, TextModelFactory
 } from '../../../lib/docregistry';
 
+import {
+  SaveHandler
+} from '../../../lib/docmanager';
+
 import {
   acceptDialog, waitForDialog
 } from '../utils';

test/src/index.ts

@@ -14,10 +14,12 @@
 
 // import './dialog/dialog.spec';
 
+import './docmanager/savehandler.spec';
+
 // import './docregistry/context.spec';
 // import './docregistry/default.spec';
 // import './docregistry/registry.spec';
-import './docregistry/savehandler.spec';
+
 
 // import './filebrowser/model.spec';