Skip to content

Klaus/issue#39 tabs performance #47

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.

Sign up for GitHub

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

Merged
deinhofer merged 3 commits into from
Apr 30, 2020
Merged

Klaus/issue#39 tabs performance #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29fe367
clear event handlers before re-init them
klues Apr 27, 2020
13f50ca
do not fire event 'actModelChangedEvent' if not needed
klues Apr 27, 2020
83c0a08
do not navigate to tab if already open
klues Apr 27, 2020
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
8 changes: 5 additions & 3 deletions model/modelList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,14 @@
returnObj.actIndex = 0;
returnObj.events = ACS.eventManager();

returnObj.addNewModel = function() {
returnObj.addNewModel = function(dontFireEvent) {
this.actIndex = (list.push(ACS.model('newFile' + filenameCounter))) - 1;
filenameCounter++;

this.events.fireEvent('newModelAddedEvent');
this.events.fireEvent('actModelChangedEvent');
this.events.fireEvent('newModelAddedEvent');
if (!dontFireEvent) {
this.events.fireEvent('actModelChangedEvent');
}
list[this.actIndex].events.registerHandler('filenameBeingChangedEvent', filenameBeingChangedEventHandler);
}

Expand Down
5 changes: 4 additions & 1 deletion view/canvasView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@
if (modelViewList[i] && (modelViewList[i].getModel() === modelList.getActModel())) {
// activate the tab
var tabId = modelViewList[i].getModelContainerId().replace('Panel', 'Tab');
document.getElementById(tabId).click();
var alreadyOpen = document.getElementById(tabId).getAttribute('aria-selected') === 'true';
if (!alreadyOpen) {
document.getElementById(tabId).click();
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions view/menuView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
}

var handleNewModel = function(e) {
modelList.addNewModel();
modelList.addNewModel(true);
modelList.getActModel().events.registerHandler('componentCollectionChangedEvent', componentCollectionChangedEventHandler);
}

Expand All @@ -757,7 +757,7 @@
modelList.setActModel(indexOfModelInList)
} else { // else load it
// if active model is not empty, open new model first
if (modelList.getActModel().componentList.length > 0) modelList.addNewModel();
if (modelList.getActModel().componentList.length > 0) modelList.addNewModel(true);
// load the model
modelList.getActModel().loadModelFromFile(loadFile);
}
Expand Down
3 changes: 3 additions & 0 deletions view/tabPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ ACS.tabPanel = function (id, // String; the id of the div-container holding the

var bindEventHandlers = function () {
// Bind handlers for the tabs:
$tabs.off();
$panels.off();

$tabs.keydown(function (e) {
return handleTabKeyDown($(this), e);
});
Expand Down