Repository: ignite Updated Branches: refs/heads/ignite-6467-1 df68d4918 -> 8d13369ad
IGNITE-8958 Web Console: Updated AngularJS to 1.7.2. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2ebb833 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2ebb833 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2ebb833 Branch: refs/heads/ignite-6467-1 Commit: c2ebb8335071ea71f0466108d5342ee18f1f29db Parents: 5734b4d Author: Ilya Borisov <klast...@gmail.com> Authored: Tue Jul 24 14:43:50 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Tue Jul 24 14:43:50 2018 +0700 ---------------------------------------------------------------------- .../web-console/e2e/testcafe/fixtures/configuration/basic.js | 3 +-- modules/web-console/frontend/package.json | 8 ++++---- .../web-console/frontend/views/templates/dropdown.tpl.pug | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c2ebb833/modules/web-console/e2e/testcafe/fixtures/configuration/basic.js ---------------------------------------------------------------------- diff --git a/modules/web-console/e2e/testcafe/fixtures/configuration/basic.js b/modules/web-console/e2e/testcafe/fixtures/configuration/basic.js index ed88a9c..b431e7b 100644 --- a/modules/web-console/e2e/testcafe/fixtures/configuration/basic.js +++ b/modules/web-console/e2e/testcafe/fixtures/configuration/basic.js @@ -77,8 +77,7 @@ test('Basic editing', async(t) => { await t.expect(cache1.getItemViewColumn(1).textContent).eql(localMode, 'Can edit cache mode'); await t.expect(cache1.getItemViewColumn(2).textContent).eql(atomic, 'Can edit cache atomicity'); - // TODO IGNITE-8094: restore to save method call. - await page.saveWithoutDownload(); + await page.save(); await t .expect(successNotification.visible).ok('Shows success notifications') .expect(successNotification.textContent).contains(`Cluster "${clusterName}" saved.`, 'Success notification has correct text', {timeout: 500}); http://git-wip-us.apache.org/repos/asf/ignite/blob/c2ebb833/modules/web-console/frontend/package.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index c336b02..666a963 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -31,17 +31,17 @@ "@uirouter/core": "5.0.19", "@uirouter/rx": "0.4.1", "@uirouter/visualizer": "4.0.2", - "angular": "1.6.6", + "angular": "1.7.2", "angular-acl": "0.1.10", - "angular-animate": "1.6.6", + "angular-animate": "1.7.2", "angular-aria": "1.6.6", - "angular-cookies": "1.6.6", + "angular-cookies": "1.7.2", "angular-drag-and-drop-lists": "1.4.0", "angular-gridster": "0.13.14", "angular-messages": "1.6.9", "angular-motion": "0.4.4", "angular-nvd3": "1.0.9", - "angular-sanitize": "1.6.6", + "angular-sanitize": "1.7.2", "angular-smart-table": "2.1.8", "angular-socket-io": "0.7.0", "angular-strap": "2.3.12", http://git-wip-us.apache.org/repos/asf/ignite/blob/c2ebb833/modules/web-console/frontend/views/templates/dropdown.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/dropdown.tpl.pug b/modules/web-console/frontend/views/templates/dropdown.tpl.pug index 2ee8616..1ddd775 100644 --- a/modules/web-console/frontend/views/templates/dropdown.tpl.pug +++ b/modules/web-console/frontend/views/templates/dropdown.tpl.pug @@ -18,7 +18,7 @@ ul.dropdown-menu(tabindex='-1' role='menu' ng-show='content && content.length') li(role='presentation' ui-sref-active='active' ng-class='{divider: item.divider, active: item.active}' ng-repeat='item in content') a(role='menuitem' tabindex='-1' ui-sref='{{item.sref}}' ng-if='!item.action && !item.divider && item.sref' ng-bind='item.text') a(role='menuitem' tabindex='-1' ng-href='{{item.href}}' ng-if='!item.action && !item.divider && item.href' target='{{item.target || ""}}' ng-bind='item.text') - a(role='menuitem' tabindex='-1' href='javascript:void(0)' ng-if='!item.action && !item.divider && item.click' ng-click='$eval(item.click);$hide()' ng-bind='item.text') + a(role='menuitem' tabindex='-1' ng-if='!item.action && !item.divider && item.click' ng-click='$eval(item.click);$hide()' ng-bind='item.text') div(role='menuitem' ng-if='item.action') i.fa.pull-right(class='{{ item.action.icon }}' ng-click='item.action.click(item.data)' bs-tooltip data-title='{{ item.action.tooltip }}' data-trigger='hover' data-placement='bottom') div: a(ui-sref='{{ item.sref }}' ng-bind='item.text')
