You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2017/08/29 00:09:34 UTC
mesos git commit: Fixed a javascript "strict mode" issue in the webui.
Repository: mesos
Updated Branches:
refs/heads/master 30e2b2ad8 -> b524aee2e
Fixed a javascript "strict mode" issue in the webui.
In strict mode code, functions cannot be declared within an if
condition.
Fix for https://issues.apache.org/jira/browse/MESOS-7912
Review: https://reviews.apache.org/r/61927/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b524aee2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b524aee2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b524aee2
Branch: refs/heads/master
Commit: b524aee2ee7196d8b9ea322ee76f0628897b5a51
Parents: 30e2b2a
Author: Alastair Montgomery <am...@williamhill.co.uk>
Authored: Mon Aug 28 17:08:37 2017 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Aug 28 17:08:37 2017 -0700
----------------------------------------------------------------------
src/webui/master/static/js/controllers.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b524aee2/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 2745614..339dfc4 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -832,6 +832,12 @@
return $scope.executor_id === executor.id;
}
+ function setRole(tasks) {
+ _.each(tasks, function(task) {
+ task.role = $scope.framework.role;
+ });
+ }
+
// Look for the executor; it's either active or completed.
$scope.executor =
_.find($scope.framework.executors, matchExecutor) ||
@@ -849,12 +855,6 @@
if (!("role" in $scope.executor)) {
$scope.executor.role = $scope.framework.role;
- function setRole(tasks) {
- _.each(tasks, function(task) {
- task.role = $scope.framework.role;
- });
- }
-
setRole($scope.executor.tasks);
setRole($scope.executor.queued_tasks);
setRole($scope.executor.completed_tasks);