rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes issue where component view would listen to all component events instead own event

Browse Source
This commit is contained in:
Mo Bitar
2018-09-02 10:05:23 -05:00
parent a94ae8dead
commit 0ea37ba7bb
2 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
app/assets/javascripts/app/directives/views/componentView.js
View File

@@ -17,39 +17,8 @@ class ComponentView {
link($scope, el, attrs, ctrl) {
$scope.el = el;
$scope.identifier = "component-view-" + Math.random();
$scope.componentValid = true;
// console.log("Registering handler", $scope.identifier, $scope.component.name);
this.componentManager.registerHandler({identifier: $scope.identifier, areas: [$scope.component.area], activationHandler: (component) => {
// activationHandlers may be called multiple times, design below to be idempotent
if(component.active) {
$scope.loading = true;
let iframe = this.componentManager.iframeForComponent(component);
if(iframe) {
// begin loading error handler. If onload isn't called in x seconds, display an error
if($scope.loadTimeout) { this.timeout.cancel($scope.loadTimeout);}
$scope.loadTimeout = this.timeout(() => {
if($scope.loading) {
$scope.issueLoading = true;
}
}, 3500)
iframe.onload = function(event) {
this.timeout.cancel($scope.loadTimeout);
$scope.loading = false;
$scope.issueLoading = false;
this.componentManager.registerComponentWindow(component, iframe.contentWindow);
}.bind(this);
}
}
},
actionHandler: (component, action, data) => {
if(action == "set-size") {
this.componentManager.handleSetSizeEvent(component, data);
}
}});
$scope.updateObserver = this.desktopManager.registerUpdateObserver((component) => {
if(component == $scope.component && component.active) {
$scope.reloadComponent();
@@ -64,6 +33,46 @@ class ComponentView {
controller($scope, $rootScope, $timeout, componentManager, desktopManager) {
'ngInject';
$scope.identifier = "component-view-" + Math.random();
componentManager.registerHandler({
identifier: $scope.identifier,
areas: [$scope.component.area],
activationHandler: (component) => {
if(component !== $scope.component) {
return;
}
// activationHandlers may be called multiple times, design below to be idempotent
if(component.active) {
$scope.loading = true;
let iframe = componentManager.iframeForComponent(component);
if(iframe) {
// begin loading error handler. If onload isn't called in x seconds, display an error
if($scope.loadTimeout) { $timeout.cancel($scope.loadTimeout);}
$scope.loadTimeout = $timeout(() => {
if($scope.loading) {
$scope.issueLoading = true;
}
}, 3500);
iframe.onload = function(event) {
// console.log("iframe loaded for component", component.name, "cancelling load timeout", $scope.loadTimeout);
$timeout.cancel($scope.loadTimeout);
$scope.loading = false;
$scope.issueLoading = false;
componentManager.registerComponentWindow(component, iframe.contentWindow);
}.bind(this);
}
}
},
actionHandler: (component, action, data) => {
if(action == "set-size") {
componentManager.handleSetSizeEvent(component, data);
}
}}
);
/*
General note regarding activation/deactivation of components:
We pass `true` to componentManager.ac/detivateComponent for the `dontSync` parameter.

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "standard-notes-web",
"version": "1.0.0",
"version": "2.3.7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {