Repository: ignite Updated Branches: refs/heads/ignite-843 969b4e627 -> cee9c1c72
IGNITE-843 Correctly show error popover. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cee9c1c7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cee9c1c7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cee9c1c7 Branch: refs/heads/ignite-843 Commit: cee9c1c7256b7aac4b81df4ff9a1809a97505dd8 Parents: 969b4e6 Author: Alexey Kuznetsov <[email protected]> Authored: Mon Sep 14 16:27:00 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Sep 14 16:27:00 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 34 ++------------------ 1 file changed, 2 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cee9c1c7/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 5a4e9dd..f1b6f8a 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -484,39 +484,9 @@ controlCenterModule.service('$common', [ var newPopover = $popover(el, {content: message}); - function findElement(query, element) { - return angular.element((element || document).querySelectorAll(query)); - } - - $timeout(function () { - var cont = newPopover.$options.container; - var tipContainer; - - console.log('0: ' + cont); - - if (cont === 'self') { - console.log('1: ' + cont); - - tipContainer = el; - } else if (angular.isElement(cont)) { - console.log('2: ' + cont); - tipContainer = cont; - } else if (cont) { - console.log('3: ' + cont); - tipContainer = findElement(cont); - } - else { - console.log('4: ' + cont); - } + popover = newPopover; - console.log('5: ' + JSON.stringify(tipContainer)); - - if (isDefined(newPopover.$options.container)) { - newPopover.show(); - - popover = newPopover; - } - }, 100); + newPopover.$promise.then(newPopover.show); $timeout(function () { newPopover.hide() }, 5000);
