Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9217C189B2 for ; Thu, 3 Mar 2016 12:07:08 +0000 (UTC) Received: (qmail 63780 invoked by uid 500); 3 Mar 2016 12:07:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63696 invoked by uid 500); 3 Mar 2016 12:07:08 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 63625 invoked by uid 99); 3 Mar 2016 12:07:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 12:07:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3BA64E78C0; Thu, 3 Mar 2016 12:07:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Thu, 03 Mar 2016 12:07:08 -0000 Message-Id: <65e55c3f341e41849b4f9b86e9b0f55b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/28] ignite git commit: IGNITE-843 Fixed "JQuery is not a function" + added missing affix fix on Domains screen. Repository: ignite Updated Branches: refs/heads/ignite-843-rc3 daccaefad -> 35aa7eb1f IGNITE-843 Fixed "JQuery is not a function" + added missing affix fix on Domains screen. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b214b0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b214b0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b214b0e Branch: refs/heads/ignite-843-rc3 Commit: 1b214b0ef904474e9e1a58af4e365eece2757b8d Parents: daccaef Author: Dmitriyff Authored: Wed Feb 24 16:29:25 2016 +0700 Committer: Alexey Kuznetsov Committed: Wed Feb 24 16:29:25 2016 +0700 ---------------------------------------------------------------------- .../app/directives/bs-affix-update/bs-affix-update.directive.js | 4 ++-- .../src/main/js/views/configuration/domains.jade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1b214b0e/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js b/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js index 131089d..dbf78e5 100644 --- a/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js +++ b/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js @@ -15,7 +15,7 @@ * limitations under the License. */ -import jQuery from 'jquery'; +import angular from 'angular'; export default ['igniteBsAffixUpdate', ['$window', '$timeout', ($window, $timeout) => { let update = null; @@ -23,7 +23,7 @@ export default ['igniteBsAffixUpdate', ['$window', '$timeout', ($window, $timeou const link = ({$last}) => { if ($last) { update && $timeout.cancel(update); - update = $timeout(() => jQuery($window).trigger('resize'), 1000); + update = $timeout(() => angular.element($window).triggerHandler('resize'), 1000); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/1b214b0e/modules/control-center-web/src/main/js/views/configuration/domains.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/domains.jade b/modules/control-center-web/src/main/js/views/configuration/domains.jade index 395ead1..0dd39a0 100644 --- a/modules/control-center-web/src/main/js/views/configuration/domains.jade +++ b/modules/control-center-web/src/main/js/views/configuration/domains.jade @@ -44,7 +44,7 @@ include ../includes/infos .scrollable-y(ng-show='(displayedRows | domainsValidation:ui.showValid:true).length > 0' style='max-height: 200px') table tbody - tr(ng-repeat='row in (displayedRows | domainsValidation:ui.showValid:true) track by row._id') + tr(ng-repeat='row in (displayedRows | domainsValidation:ui.showValid:true) track by row._id' ignite-bs-affix-update) td a(ng-class='{active: row._id == selectedItem._id}' ng-click='selectItem(row)') {{$index + 1}}) {{row.valueType}} label.placeholder(ng-show='(displayedRows | domainsValidation:ui.showValid:true).length == 0') No domain models found