Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Improve context handling#4453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ian-r-rose merged 66 commits intojupyterlab:masterfromjasongrout:context
May 25, 2018
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
66 commits
Select commitHold shift + click to select a range
7a5bd00
WIP context cleanups
jasongroutApr 23, 2018
78df852
Handle paths having multiple contexts.
jasongroutApr 24, 2018
db40067
Some new docs about how JupyterLab deals with documents.
jasongroutApr 25, 2018
1e298d7
WIP
jasongroutApr 26, 2018
2e93f83
WIP
jasongroutApr 27, 2018
9c7c4a8
WIP
jasongroutApr 28, 2018
92d58d0
Revert back to original widget creation workflow, but insist we get b…
jasongroutMay 7, 2018
3816766
WIP for MimeDocument widget
jasongroutMay 9, 2018
6ede2da
WIP trying out an idea for a mime document renderer, pushing most log…
jasongroutMay 10, 2018
0ff19f6
WIP converting code to use IDocumentWidget
jasongroutMay 10, 2018
4aa4de6
Fix all compilation errors dealing with the move to IDocumentWidget.
jasongroutMay 10, 2018
58a7a4b
Fix lint errors
jasongroutMay 11, 2018
3fc6bde
WIP: Fix some tests, skip others while we are evaluating this approach.
jasongroutMay 11, 2018
1107f69
Create a specialized MimeDocument document widget type.
jasongroutMay 12, 2018
12dfc8e
Delay a document widget from being ready until the context is ready.
jasongroutMay 12, 2018
af12ced
Use the ABCWidgetFactory type parameter defaults where we can to simp…
jasongroutMay 12, 2018
55f8b32
Convert the notebook to use DocumentWidget
jasongroutMay 12, 2018
631d0e1
Move notebook content generation to the widget factory.
jasongroutMay 13, 2018
8b3b7e1
Remove image viewer toolbar-lookalike css.
jasongroutMay 13, 2018
db7fc2d
Move dirty state handling to the document widget.
jasongroutMay 13, 2018
c90b59b
Get rid of double toolbars in file editor and mime document.
jasongroutMay 13, 2018
c3496d1
Switch SingletonLayout workaround from panel layout to box layout for…
jasongroutMay 13, 2018
f7b03da
Adjust toolbar height to account for visible widgets.
jasongroutMay 14, 2018
78e85c3
Fix toolbar collapse status based on explicit hiding, rather than cum…
jasongroutMay 14, 2018
b60aaf5
Move csv viewer toolbar over to document widget toolbar.
jasongroutMay 15, 2018
1a6b58d
Delete now-redundant notebook toolbar styling.
jasongroutMay 15, 2018
11ffaaf
Revert part of 7a5bd00ce3df55b85c747d02a00e87c49e3288b4 dealing with …
jasongroutMay 15, 2018
cbb1b6a
Make a CSVDocumentWidget which creates default content and toolbar.
jasongroutMay 15, 2018
6554c24
Fix tests
jasongroutMay 15, 2018
b0a3234
Merge branch 'master' into context
jasongroutMay 15, 2018
5d9d5db
Fix issues with the merge.
jasongroutMay 16, 2018
7ecb3c8
Fix CSV viewer toolbar tests.
jasongroutMay 16, 2018
447ab04
Fix mimedocument tests.
jasongroutMay 16, 2018
ebac5f0
Allow MainAreaWidget ready promises actually be Promise<any> for conv…
jasongroutMay 16, 2018
ae8b29b
Add document widget tests.
jasongroutMay 16, 2018
087d1d9
Fix more tests.
jasongroutMay 16, 2018
0468ec2
WIP notebook tests.
jasongroutMay 17, 2018
ae892b4
More notebook test fixes.
jasongroutMay 17, 2018
ba2802f
Fix more tests, convert many to use async/await.
jasongroutMay 17, 2018
672e843
Add the notebook panel .notebook attribute to ease the transition.
jasongroutMay 17, 2018
57b5c07
Fix integrity failures.
jasongroutMay 17, 2018
99c6c45
Make MainAreaWidget promise resolve *after* the spinner is removed.
jasongroutMay 17, 2018
5a21d5a
When a code editor is created, clear the history after setting the in…
jasongroutMay 17, 2018
7b618ba
Clear the notebook model undo history when the model is set.
jasongroutMay 17, 2018
ec7d693
Move .notebook references to .content
jasongroutMay 17, 2018
d72fd54
Delete the .notebook attribute for notebook panels again.
jasongroutMay 18, 2018
ce1abda
Fix model initialization test.
jasongroutMay 18, 2018
5da4760
path generally will be a stricter criteria than factory name, so matc…
jasongroutMay 18, 2018
64212a6
Initialize a model after the context's first save/revert.
jasongroutMay 18, 2018
5027e9e
Merge remote-tracking branch 'origin/master' into context
jasongroutMay 20, 2018
f12be48
Just use the BoxLayout instead of trying SingletonLayout.
jasongroutMay 20, 2018
7bb239a
Remove comment monologue that is no longer necessary or accurate of t…
jasongroutMay 20, 2018
56e5766
Run notebook panel contentfactory tests.
jasongroutMay 20, 2018
427a67e
Tweak documentation
jasongroutMay 22, 2018
4efcad2
Use StackedLayout instead of BoxLayout for single children.
jasongroutMay 22, 2018
21040a0
Fix review comment issues.
jasongroutMay 23, 2018
bf94b1e
Document the choices around focusing content.
jasongroutMay 23, 2018
d031011
We don’t need the document opener spinner anymore now that the docume…
jasongroutMay 23, 2018
dba0b63
MainAreaWidget attribute name change: ready -> reveal
jasongroutMay 23, 2018
414fd43
Change the main area widget reveal promise to ‘revealed’
jasongroutMay 23, 2018
413f401
Fix the revealed logic for the notebook panel.
jasongroutMay 23, 2018
63c41c1
Clarify logic around `isRevealed` to mean “spinner is gone, either a …
jasongroutMay 23, 2018
3ab6372
Update docs per review comments.
jasongroutMay 24, 2018
6749792
Move signal construction to attribute definition, consistent with the…
jasongroutMay 24, 2018
693810c
Support making the content null.
jasongroutMay 24, 2018
ac907af
Change MainAreaWidget to using the spinner as just a DOM node rather …
jasongroutMay 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
NextNext commit
WIP: Fix some tests, skip others while we are evaluating this approach.
  • Loading branch information
@jasongrout
jasongrout committedMay 11, 2018
commit3fc6bde35ebebc2bb300a189d7ae1574b3a0165a
16 changes: 5 additions & 11 deletionstests/test-docmanager/src/manager.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,25 +16,19 @@ import {
} from '@jupyterlab/docmanager';

import {
DocumentRegistry, TextModelFactory, ABCWidgetFactory
DocumentRegistry, TextModelFactory, ABCWidgetFactory, DocumentWidget, IDocumentWidget
} from '@jupyterlab/docregistry';

import {
dismissDialog
} from '../../utils';


class DocWidget extends Widget implements DocumentRegistry.IReadyWidget {
get ready(): Promise<void> {
return Promise.resolve(undefined);
}
}


class WidgetFactory extends ABCWidgetFactory<DocumentRegistry.IReadyWidget, DocumentRegistry.IModel> {
class WidgetFactory extends ABCWidgetFactory<IDocumentWidget, DocumentRegistry.IModel> {

protected createNewWidget(context: DocumentRegistry.Context): DocumentRegistry.IReadyWidget {
let widget = new DocWidget();
protected createNewWidget(context: DocumentRegistry.Context): IDocumentWidget {
const content = new Widget();
const widget = new DocumentWidget({ content, context });
widget.addClass('WidgetFactory');
return widget;
}
Expand Down
29 changes: 13 additions & 16 deletionstests/test-docmanager/src/widgetmanager.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,26 +24,19 @@ import {
} from '@jupyterlab/docmanager';

import {
DocumentRegistry, TextModelFactory, ABCWidgetFactory, Context
DocumentRegistry, TextModelFactory, ABCWidgetFactory, Context, DocumentWidget, IDocumentWidget
} from '@jupyterlab/docregistry';

import {
acceptDialog, dismissDialog
} from '../../utils';


class WidgetFactory extends ABCWidgetFactory<IDocumentWidget, DocumentRegistry.IModel> {

class DocWidget extends Widget implements DocumentRegistry.IReadyWidget {
get ready(): Promise<void> {
return Promise.resolve(undefined);
}
}


class WidgetFactory extends ABCWidgetFactory<DocumentRegistry.IReadyWidget, DocumentRegistry.IModel> {

protected createNewWidget(context: DocumentRegistry.Context): DocumentRegistry.IReadyWidget {
let widget = new DocWidget();
protected createNewWidget(context: DocumentRegistry.Context): IDocumentWidget {
const content = new Widget();
const widget = new DocumentWidget({ content, context });
widget.addClass('WidgetFactory');
return widget;
}
Expand DownExpand Up@@ -160,20 +153,23 @@ describe('@jupyterlab/docmanager', () => {
describe('#adoptWidget()', () => {

it('should install a message hook', () => {
let widget = new DocWidget();
const content = new Widget();
const widget = new DocumentWidget({ content, context });
manager.adoptWidget(context, widget);
MessageLoop.sendMessage(widget, new Message('foo'));
expect(manager.methods).to.contain('messageHook');
});

it('should add the document class', () => {
let widget = new DocWidget();
const content = new Widget();
const widget = new DocumentWidget({ content, context });
manager.adoptWidget(context, widget);
expect(widget.hasClass('jp-Document')).to.be(true);
});

it('should be retrievable', () => {
let widget = new DocWidget();
const content = new Widget();
const widget = new DocumentWidget({ content, context });
manager.adoptWidget(context, widget);
expect(manager.contextForWidget(widget)).to.be(context);
});
Expand DownExpand Up@@ -240,7 +236,8 @@ describe('@jupyterlab/docmanager', () => {
describe('#messageHook()', () => {

it('should be called for a message to a tracked widget', () => {
let widget = new DocWidget();
const content = new Widget();
const widget = new DocumentWidget({ content, context });
manager.adoptWidget(context, widget);
MessageLoop.sendMessage(widget, new Message('foo'));
expect(manager.methods).to.contain('messageHook');
Expand Down
15 changes: 5 additions & 10 deletionstests/test-docregistry/src/default.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,24 +9,19 @@ import {

import {
ABCWidgetFactory, Base64ModelFactory, DocumentModel,
DocumentRegistry, TextModelFactory
DocumentRegistry,DocumentWidget, IDocumentWidget,TextModelFactory
} from '@jupyterlab/docregistry';

import {
createFileContext
} from '../../utils';


class DocWidget extends Widget implements DocumentRegistry.IReadyWidget {
get ready(): Promise<void> {
return Promise.resolve(undefined);
}
}

class WidgetFactory extends ABCWidgetFactory<IDocumentWidget, DocumentRegistry.IModel> {

class WidgetFactory extends ABCWidgetFactory<DocumentRegistry.IReadyWidget, DocumentRegistry.IModel> {
protected createNewWidget(context: DocumentRegistry.Context): DocumentRegistry.IReadyWidget {
let widget = newDocWidget();
protected createNewWidget(context: DocumentRegistry.Context): IDocumentWidget {
const content = new Widget();
const widget = newDocumentWidget({ content, context });
widget.addClass('WidgetFactory');
return widget;
}
Expand Down
14 changes: 7 additions & 7 deletionstests/test-docregistry/src/mimedocument.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ import {

import {
DocumentRegistry, Context,
MimeDocument, MimeDocumentFactory
MimeContent, MimeDocumentFactory
} from '@jupyterlab/docregistry';

import {
Expand All@@ -28,7 +28,7 @@ import {
const RENDERMIME = defaultRenderMime();


class LogRenderer extendsMimeDocument {
class LogRenderer extendsMimeContent {
methods: string[] = [];

protected onAfterAttach(msg: Message): void {
Expand DownExpand Up@@ -71,7 +71,7 @@ describe('docregistry/mimedocument', () => {
dContext.dispose();
});

describe('MimeDocumentFactory', () => {
describe.skip('MimeDocumentFactory', () => {

describe('#createNew()', () => {

Expand All@@ -82,26 +82,26 @@ describe('docregistry/mimedocument', () => {
rendermime: RENDERMIME,
primaryFileType: DocumentRegistry.defaultTextFileType
});
expect(widgetFactory.createNew(dContext)).to.be.a(MimeDocument);
expect(widgetFactory.createNew(dContext)).to.be.a(MimeContent);
});

});

});

describe('MimeDocument', () => {
describe.skip('MimeContent', () => {

describe('#constructor()', () => {

it('should require options', () => {
let widget = newMimeDocument({
let widget = newMimeContent({
context: dContext,
rendermime: RENDERMIME,
mimeType: 'text/markdown',
renderTimeout: 1000,
dataType: 'string'
});
expect(widget).to.be.a(MimeDocument);
expect(widget).to.be.a(MimeContent);
});

});
Expand Down
16 changes: 5 additions & 11 deletionstests/test-docregistry/src/registry.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,21 +20,15 @@ import {
} from '@phosphor/widgets';

import {
ABCWidgetFactory, Base64ModelFactory, DocumentRegistry
ABCWidgetFactory, Base64ModelFactory, DocumentRegistry, DocumentWidget, IDocumentWidget
} from '@jupyterlab/docregistry';


class DocWidget extends Widget implements DocumentRegistry.IReadyWidget {
get ready(): Promise<void> {
return Promise.resolve(undefined);
}
}


class WidgetFactory extends ABCWidgetFactory<DocumentRegistry.IReadyWidget, DocumentRegistry.IModel> {
class WidgetFactory extends ABCWidgetFactory<IDocumentWidget, DocumentRegistry.IModel> {

protected createNewWidget(context: DocumentRegistry.Context): DocumentRegistry.IReadyWidget {
let widget = new DocWidget();
protected createNewWidget(context: DocumentRegistry.Context): IDocumentWidget {
const content = new Widget();
const widget = new DocumentWidget({ content, context });
widget.addClass('WidgetFactory');
return widget;
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp