From 7199b725cbe55cbb6ee3324fb649c9a160837116 Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 15 Nov 2016 22:46:21 +0530 Subject: [PATCH] LM & search is workin. scroll is not done as top, left values is not getting by css prop of div in IE --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 36 ++++++++++++++++++++++++------------ 400-SOURCECODE/AIAHTML5.Web/index.html | 4 ++-- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 6717bf4..70246a4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2425,7 +2425,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo console.log('$scope.highlightedBR.length= ' + $scope.highlightedBR.length) if ($scope.highlightedBR != null || $scope.highlightedBR != undefined) { - + if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.highlightedBR.length == 9)) { $scope.doAligneCanvasWithTerm = true; } @@ -2438,7 +2438,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else if ((($rootScope.viewOrientationId == '6')) && ($scope.highlightedBR.length == 1)) { $scope.doAligneCanvasWithTerm = true; } - + alert('$scope.doAligneCanvasWithTerm = ' + $scope.doAligneCanvasWithTerm) if ($scope.doAligneCanvasWithTerm == true) { if ($rootScope.isListManagerSelected == true) @@ -6809,7 +6809,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.searchFilter = event.currentTarget.innerHTML; //2. - $scope.HighlightBodyOnListManagerSelection(event); + $scope.HighlightBodyOnListManagerSelection(event.currentTarget.id); $scope.IsSearchVisible = false; $rootScope.isNormalMode = false; @@ -6979,7 +6979,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo for (var j = 0; j < $scope.VocabTermTxt.length; j++) { - var $el = $('').appendTo('#termList') + var $el = $('').appendTo('#termList') $compile($el)($scope); } @@ -6997,9 +6997,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $scope.HighlightBodyOnListManagerSelection = function (event) { + $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber) { + + console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber) // Terms search in the Search list should be disable in the List Manager and Vice-Versa. - if ($rootScope.prevId == event.currentTarget.id) { + if ($rootScope.prevId == actualTermNumber) { $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); @@ -7011,12 +7013,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#spinner').css('visibility', 'visible'); - $rootScope.prevId = event.currentTarget.id; + $rootScope.prevId = actualTermNumber; $("#termList").find("option").attr('selected', false); $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); - $("#termList").find("option[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); + $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); - $("div#backdrop #termlistfilter li").find("a[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); + $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); $scope.terminateCurrentlyRunningWPs(); //debugger $rootScope.isListManagerSelected = true; @@ -7037,7 +7039,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isHighlightBodyByBodySystem = false; //1. - $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; + $rootScope.actualTermNumber = actualTermNumber;//attributes[0].value; console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber) //2. @@ -7232,6 +7234,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.aligneCanvasWithTerm = function () { + alert('inside align') console.log('aligneCanvasWithTerm') var newX = parseInt($scope.scaleValue($scope.termCoordinate.x, $scope.zoomInOut, DA[0].ZOOM_TERM_DATA)); var newY = parseInt($scope.scaleValue($scope.termCoordinate.y, $scope.zoomInOut, DA[0].ZOOM_TERM_DATA)); @@ -7265,7 +7268,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { newX = maxHScrollPos; } - + alert('newX= ' + newX + ',newY= ' + newY) $('#canvasDiv').scrollLeft(newX); $('#canvasDiv').scrollTop(newY); $scope.isLoading = false; @@ -7371,7 +7374,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo for (var j = 0; j < $scope.VocabTermTxt.length; j++) { - var $el = $('').appendTo('#termList') + var $el = $('').appendTo('#termList') $compile($el)($scope); } @@ -7602,4 +7605,13 @@ function OnZoom() scope.$apply(function () { scope.enableZoom(); }); +} + +function onListManagerTermSelection(event) { + alert('selected') + var scope = angular.element(document.getElementById("daView")).scope(); + scope.$apply(function () { + scope.HighlightBodyOnListManagerSelection(event); + }); + } \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 847ce1f..073abac 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -718,7 +718,7 @@ - + @@ -729,7 +729,7 @@
- +
-- libgit2 0.21.4