cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 10:28:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

gui: Load modals before calling initController() (fixes #3301)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3319
This commit is contained in:
Daniel Harte 2016-06-17 06:44:55 +00:00 committed by Jakob Borg
parent b779e22205
commit 55fc3cb2c5
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/default/syncthing/core/modalDirective.js
View File

@ -67,6 +67,9 @@ angular.module('syncthing.core')
}
});
// inform syncthingContoller that a modal is ready
scope.$parent.modalLoaded();
}
};
});

16
gui/default/syncthing/core/syncthingController.js
View File

@ -221,9 +221,7 @@ angular.module('syncthing.core')
document.cookie = "firstVisit=" + Date.now() + ";max-age=" + 30 * 24 * 3600;
} else {
if (+firstVisit < Date.now() - 4 * 3600 * 1000) {
setTimeout(function () {
$('#ur').modal();
}, 2500);
$('#ur').modal();
}
}
}
@ -1623,6 +1621,14 @@ angular.module('syncthing.core')
});
};
// pseudo main. called on all definitions assigned
initController();
$scope.modalLoaded = function () {
// once all modal elements have been processed
if ($('modal').length === 0) {
// pseudo main. called on all definitions assigned
initController();
}
}
});