Commit 7daf2fa7453b5d65b6a3c7b8b25699ddde0b4460
Merge branch 'Bug#7978' into Develop
Showing
1 changed file
with
16 additions
and
13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -438,23 +438,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -438,23 +438,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | // 0.2 getting corresponding body view title | 440 | // 0.2 getting corresponding body view title |
| 441 | - var counter = 1; | 441 | + //var counter = 1; |
| 442 | var tittle = localStorage.getItem("currentViewTitleFromJson"); | 442 | var tittle = localStorage.getItem("currentViewTitleFromJson"); |
| 443 | + localStorage.setItem("currentViewTitle", tittle); | ||
| 443 | 444 | ||
| 444 | - if (openViews != null && openViews != undefined) { | ||
| 445 | - angular.forEach(openViews, function (value, key) { | 445 | + //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD |
| 446 | + //if (openViews != null && openViews != undefined) { | ||
| 447 | + // angular.forEach(openViews, function (value, key) { | ||
| 446 | 448 | ||
| 447 | - if (value.bodyView == tittle) { | ||
| 448 | - tittle = localStorage.getItem("currentViewTitleFromJson") + counter++; | ||
| 449 | - $rootScope.currentActiveViewTitle = tittle; | ||
| 450 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 451 | - } | 449 | + // if (value.bodyView == tittle) { |
| 450 | + // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++; | ||
| 451 | + // $rootScope.currentActiveViewTitle = tittle; | ||
| 452 | + // localStorage.setItem("currentViewTitle", tittle); | ||
| 453 | + // } | ||
| 452 | 454 | ||
| 453 | - }); | ||
| 454 | - } | ||
| 455 | - else { | ||
| 456 | - localStorage.setItem("currentViewTitle", tittle); | ||
| 457 | - } | 455 | + // }); |
| 456 | + //} | ||
| 457 | + //else { | ||
| 458 | + // localStorage.setItem("currentViewTitle", tittle); | ||
| 459 | + //} | ||
| 458 | 460 | ||
| 459 | //0.3 | 461 | //0.3 |
| 460 | 462 | ||
| @@ -468,6 +470,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -468,6 +470,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 468 | url: 'app/views/da/da-view.html' | 470 | url: 'app/views/da/da-view.html' |
| 469 | }, | 471 | }, |
| 470 | title: localStorage.getItem("currentViewTitle"), | 472 | title: localStorage.getItem("currentViewTitle"), |
| 473 | + | ||
| 471 | position: { | 474 | position: { |
| 472 | top: 70, | 475 | top: 70, |
| 473 | left: 1, | 476 | left: 1, |