Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Add an editing mode #358

Merged
merged 22 commits into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
424f6b5
Initial WorkspaceView unit tests
aarranz Oct 26, 2018
8feddd1
Initial WorkspaceTabView unit tests
aarranz Oct 30, 2018
3f92055
Initial WorkspaceTabViewDragboard unit tests
aarranz Nov 6, 2018
62d325c
Some fixes
aarranz Dec 28, 2018
0031577
Remove not used getNumberOfTabs method from StyledElements.Notebook
aarranz Dec 28, 2018
b2fee38
Remove getVisibleTab from StyledElements.Notebook
aarranz Dec 28, 2018
11632d4
Fix exitFullscreen tests on StyledElements.Notebook
aarranz Dec 28, 2018
6780a32
Complete StyledElement.Notebook coverage
aarranz Dec 28, 2018
2d6cf82
Remove deprecated getId method from StyledElement.Notebook
aarranz Dec 28, 2018
2184068
Remove deprecated getId method from StyledElement.Alternative
aarranz Dec 28, 2018
021c01b
Add edit mode support
aarranz Dec 28, 2018
acb75c6
StyledElements.Alternatives: Provide a value when fulfilling promises
aarranz Jan 13, 2019
186cf7e
Fix StyledElements.Utils.waitTransition for display: none elements
aarranz Jan 13, 2019
69ee3ab
Fix selenium tests
aarranz Jan 13, 2019
e1d4f27
Provide an active event on Toggle buttons
aarranz Mar 22, 2019
344919e
Initial work on displaying widget menus for volatile widgets and cont…
aarranz Mar 22, 2019
5d624eb
Readd support for the context option when using the StyledElements.No…
aarranz Apr 5, 2019
728153b
Improve ObjectWithEvents spec by disable console logging of exception…
aarranz Apr 5, 2019
1123c0d
Fix waitTransition tests
aarranz Apr 5, 2019
c41f4d9
Fix selenium tests
aarranz Apr 5, 2019
4d65bb6
Remove wiring-view CSS class
aarranz Apr 16, 2019
1e63d1f
Fixes on the selenium tests
aarranz Apr 16, 2019
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
3 changes: 3 additions & 0 deletions src/GruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ var WirecloudFiles = [
'wirecloud/platform/static/js/wirecloud/ui/WiringEditor/BehaviourEngine.js',
'wirecloud/platform/static/js/wirecloud/ui/WiringEditor/Endpoint.js',
'wirecloud/platform/static/js/wirecloud/ui/WiringEditor/KeywordSuggestion.js',
'wirecloud/platform/static/js/wirecloud/ui/WorkspaceView.js',
'wirecloud/platform/static/js/wirecloud/ui/WorkspaceTabView.js',
'wirecloud/platform/static/js/wirecloud/ui/WorkspaceTabViewDragboard.js',
'wirecloud/platform/static/js/wirecloud/ui/SharingWindowMenu.js',
'wirecloud/platform/static/js/wirecloud/wiring/Endpoint.js',
'wirecloud/platform/static/js/wirecloud/wiring/EndpointTypeError.js',
Expand Down
22 changes: 17 additions & 5 deletions src/js_tests/styledelements/AlternativesSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
expect(element.wrapperElement.children[1]).toBe(alt3.wrapperElement);
});

var p = element.removeAlternative(alt2.getId(), {onComplete: listener});
var p = element.removeAlternative(alt2.altId, {onComplete: listener});

expect(element.alternativeList).toEqual([alt1, alt3]);
expect(p).toEqual(jasmine.any(Promise));
Expand Down Expand Up @@ -342,7 +342,11 @@
var p = element.showAlternative(alt1);

expect(p).toEqual(jasmine.any(Promise));
p.then(() => {
p.then((result) => {
expect(result).toEqual({
in: alt1,
out: alt1
});
expect(element.visibleAlt).toBe(alt1);
done();
});
Expand All @@ -356,7 +360,11 @@
});

expect(p).toEqual(jasmine.any(Promise));
p.then(() => {
p.then((result) => {
expect(result).toEqual({
in: alt3,
out: alt1
});
expect(element.visibleAlt).toBe(alt3);
done();
});
Expand All @@ -367,12 +375,16 @@
expect(element.visibleAlt).toBe(alt2);
});

var p = element.showAlternative(alt2.getId(), {
var p = element.showAlternative(alt2.altId, {
onComplete: listener
});

expect(p).toEqual(jasmine.any(Promise));
p.then(() => {
p.then((result) => {
expect(result).toEqual({
in: alt2,
out: alt1
});
expect(listener).toHaveBeenCalledWith(element, alt1, alt2);
done();
});
Expand Down
Loading