From ac503277424e62fc6257e0272924adc7c0731d25 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 13 Dec 2016 15:42:46 +0530 Subject: [PATCH] DA > Annotation search from Search List is not highlight in the List manager. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 7 +++++++ 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/index.html | 4 ++-- 3 files changed, 117 insertions(+), 94 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index cf77512..4b8f1d1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -6820,6 +6820,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.jumpToTerm = function (event) { + $rootScope.searchSelectedText = $('#'+ event.currentTarget.id).text(); + $('#termList option[selected="selected"]').prop("selected", false); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); + + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 1022e65..3b3b58d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -816,108 +816,117 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", } $rootScope.PinFn = function (canvasId, PinNumber, offsetX1, offsetY1, x, y, PinArcNumber) { - var radial = $('#canvas').createGradient({ - x1: 50, y1: 50, - x2: 50, y2: 50, - r1: 10, r2: 30, - c1: 'rgba(100, 50, 0,0)', - c2: 'grey' - }); - $(canvasId).drawLine({ - draggable: true, - layer: true, - name: "Pin_" + PinNumber, - groups: ["Pin_" + PinNumber], - dragGroups: ["Pin_" + PinNumber], - strokeStyle: 'black', - strokeWidth: 2, - x1: offsetX1, y1: offsetY1, - x2: x, y2: y, - - click: function (layer) { - - $rootScope.shapeTypePin = "Pin"; - $rootScope.canvasLayerNameCollection = []; - var pinLine_layer = layer.name; - var pinLine_layer_split = pinLine_layer.split("_"); - var pinArcName = "ArcPin_"; - var pinResult = pinArcName.concat(pinLine_layer_split[1]); - - $rootScope.canvasLayerNameCollection.push({ pinName: layer.name, ArcName: pinResult }); - - $(canvasId).setLayer(layer.name, { - handle: { - type: 'arc', - fillStyle: '#fff', - strokeStyle: '#c33', - strokeWidth: 2, - // width: 5, height: 5, - radius: 3 - } - }).drawLayers(); - - - }, - mouseout: function (layer) { - - $rootScope.canvasLayerNameCollection = []; - $(canvasId).setLayer(layer.name, { - handle: { - type: 'arc', - fillStyle: '#fff', - strokeStyle: '#c33', - strokeWidth: 0, - // width: 0, height: 0, - radius: 0 - } - }).drawLayers(); + var xAxisPinDiff = offsetX1 - x; + var yAxisPinDiff = offsetY1 - y; + if (xAxisPinDiff != 0 && yAxisPinDiff != 0) { - }, - mouseover: function (layer) { + var radial = $('#canvas').createGradient({ + x1: 50, y1: 50, + x2: 50, y2: 50, + r1: 10, r2: 30, + c1: 'rgba(100, 50, 0,0)', + c2: 'grey' + }); + $(canvasId).drawLine({ + draggable: true, + layer: true, + name: "Pin_" + PinNumber, + groups: ["Pin_" + PinNumber], + dragGroups: ["Pin_" + PinNumber], + strokeStyle: 'black', + strokeWidth: 2, + x1: offsetX1, y1: offsetY1, + x2: x, y2: y, + + click: function (layer) { + + $rootScope.shapeTypePin = "Pin"; + $rootScope.canvasLayerNameCollection = []; + var pinLine_layer = layer.name; + var pinLine_layer_split = pinLine_layer.split("_"); + var pinArcName = "ArcPin_"; + var pinResult = pinArcName.concat(pinLine_layer_split[1]); + + $rootScope.canvasLayerNameCollection.push({ pinName: layer.name, ArcName: pinResult }); + + $(canvasId).setLayer(layer.name, { + handle: { + type: 'arc', + fillStyle: '#fff', + strokeStyle: '#c33', + strokeWidth: 2, + // width: 5, height: 5, + radius: 3 + } + }).drawLayers(); + + + }, + mouseout: function (layer) { + + $rootScope.canvasLayerNameCollection = []; + $(canvasId).setLayer(layer.name, { + handle: { + type: 'arc', + fillStyle: '#fff', + strokeStyle: '#c33', + strokeWidth: 0, + // width: 0, height: 0, + radius: 0 + } + + }).drawLayers(); + + }, + mouseover: function (layer) { + + + $(canvasId).setLayer(layer.name, { + handle: { + type: 'arc', + fillStyle: '#fff', + strokeStyle: '#c33', + strokeWidth: 2, + // width: 5, height: 5, + radius: 3 + } + }).drawLayers(); - $(canvasId).setLayer(layer.name, { - handle: { - type: 'arc', - fillStyle: '#fff', - strokeStyle: '#c33', - strokeWidth: 2, - // width: 5, height: 5, - radius: 3 - } - }).drawLayers(); + } + }).drawArc({ + draggable: true, + name: "ArcPin_" + PinArcNumber, + // name: "Pin_" + $rootScope.resetPin, + layer: true, + groups: ["Pin_" + PinNumber], + dragGroups: ["Pin_" + PinNumber], + strokeStyle: 'grey', + strokeWidth: 2, + fillStyle: radial, + x: offsetX1, y: offsetY1, + radius: 5, + //handle: { + // type: 'arc', + // fillStyle: '#fff', + // strokeStyle: '#c33', + // strokeWidth: 2, + // radius: 3 + //}, - } - }).drawArc({ - draggable: true, - name: "ArcPin_" + PinArcNumber, - // name: "Pin_" + $rootScope.resetPin, - layer: true, - groups: ["Pin_" + PinNumber], - dragGroups: ["Pin_" + PinNumber], - strokeStyle: 'grey', - strokeWidth: 2, - fillStyle: radial, - x: offsetX1, y: offsetY1, - radius: 5, - //handle: { - // type: 'arc', - // fillStyle: '#fff', - // strokeStyle: '#c33', - // strokeWidth: 2, - // radius: 3 - //}, + add: function (layer) { - add: function (layer) { + $rootScope.PinArcNumber = layer.name; + // $scope.arr = []; - $rootScope.PinArcNumber = layer.name; - // $scope.arr = []; + }, - }, + }).drawLayers(); - }).drawLayers(); + } + $('.btnCursor').trigger('click'); $(".btn-annotation").removeClass("activebtncolor"); $('.btnCursor').addClass('activebtncolor'); @@ -1895,6 +1904,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.islistManagerEventAlredayDispachted = true; $rootScope.$broadcast('listManagerEvent', true); + + $('#termList option[selected="selected"]').prop("selected", false); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); + + } $rootScope.CloseListManager = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index ae9bae2..b2a5d8a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -49,8 +49,8 @@ #termList option:hover { - background-color: #3399FF; - color:#fff; + background-color: #3399FF !important; + color: #fff !important; } -- libgit2 0.21.4