Commit 767ecfcafad8466062b4f295091b9ad763737aa0
Merge branch 'Bug#7235' into Develop
Showing
1 changed file
with
3 additions
and
2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5122,7 +5122,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5122,7 +5122,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5122 | var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); | 5122 | var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); |
5123 | if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { | 5123 | if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { |
5124 | for (var j = 0; j < modestyCanvases.length; j++) { | 5124 | for (var j = 0; j < modestyCanvases.length; j++) { |
5125 | - modestyCanvases[j].remove(); | 5125 | + |
5126 | + modestyCanvases[j].parentNode.removeChild(modestyCanvases[j]); | ||
5126 | } | 5127 | } |
5127 | } | 5128 | } |
5128 | } | 5129 | } |
@@ -6976,7 +6977,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6976,7 +6977,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6976 | 6977 | ||
6977 | 6978 | ||
6978 | for (var j = 0; j < $scope.VocabTermTxt.length; j++) { | 6979 | for (var j = 0; j < $scope.VocabTermTxt.length; j++) { |
6979 | - var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') | 6980 | + var $el = $('<option title ="'+ $scope.VocabTermTxt[j]._TermText+ '" ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') |
6980 | $compile($el)($scope); | 6981 | $compile($el)($scope); |
6981 | 6982 | ||
6982 | } | 6983 | } |