Repository: tez Updated Branches: refs/heads/branch-0.7 f1e249986 -> dd8d06eca
TEZ-2482. Tez UI: Mouse events not working on IE11 (Sreenath Somarajapuram via pramachandran) (cherry picked from commit 317d45a5d410f2e6afedbe8563c258f4cc667d67) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/dd8d06ec Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/dd8d06ec Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/dd8d06ec Branch: refs/heads/branch-0.7 Commit: dd8d06ecacb605d685c78853da52fd3959778213 Parents: f1e2499 Author: Prakash Ramachandran <[email protected]> Authored: Thu May 28 00:23:08 2015 +0530 Committer: Prakash Ramachandran <[email protected]> Committed: Thu May 28 00:24:14 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../scripts/controllers/dag-view-controller.js | 63 +++++++++++++++----- 2 files changed, 48 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/dd8d06ec/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8daa52d..af4eba0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Release 0.7.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2482. Tez UI: Mouse events not working on IE11 TEZ-1529. ATS and TezClient integration in secure kerberos enabled cluster. TEZ-2481. Tez UI: graphical view does not render properly on IE11 TEZ-2474. The old taskNum is logged incorrectly when parallelism is changed http://git-wip-us.apache.org/repos/asf/tez/blob/dd8d06ec/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js index 5241060..aabdb0d 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag-view-controller.js @@ -52,24 +52,55 @@ App.DagViewController = App.TablePageController.extend({ return this._super(); }, + redirect: function (details) { + switch(details.type) { + case 'vertex': + this.transitionToRoute('vertex', details.d.get('data.id')); + break; + case 'task': + this.transitionToRoute('vertex.tasks', details.d.get('data.id')); + break; + case 'io': + this.transitionToRoute('vertex.additionals', details.d.get('data.id')); + break; + case 'input': + this.transitionToRoute('input.configs', details.d.get('parent.data.id'), details.d.entity); + break; + case 'output': + this.transitionToRoute('output.configs', details.d.get('vertex.data.id'), details.d.entity); + break; + } + }, + actions: { + modalConfirmed: function () { + this.redirect(this.get('redirectionDetails')); + }, + modalCanceled: function () { + }, entityClicked: function (details) { - switch(details.type) { - case 'vertex': - this.transitionToRoute('vertex', details.d.get('data.id')); - break; - case 'task': - this.transitionToRoute('vertex.tasks', details.d.get('data.id')); - break; - case 'io': - this.transitionToRoute('vertex.additionals', details.d.get('data.id')); - break; - case 'input': - this.transitionToRoute('input.configs', details.d.get('parent.data.id'), details.d.entity); - break; - case 'output': - this.transitionToRoute('output.configs', details.d.get('vertex.data.id'), details.d.entity); - break; + + /** + * In IE 11 under Windows 7, mouse events are not delivered to the page + * anymore at all after a SVG use element that was under the mouse is + * removed from the DOM in the event listener in response to a mouse click. + * See https://connect.microsoft.com/IE/feedback/details/796745 + * + * This condition and related actions must be removed once the bug is fixed + * in all supported IE versions + */ + if(App.env.isIE) { + this.set('redirectionDetails', details); + Bootstrap.ModalManager.confirm( + this, + 'Confirmation Required!', + 'You will be redirected to %@ page'.fmt( + details.type == "io" ? "additionals" : details.type + ) + ); + } + else { + this.redirect(details); } } },
