summaryrefslogtreecommitdiffstats
path: root/ecomp-portal-FE-common/client/app/views/tabs
diff options
context:
space:
mode:
authorKishore Reddy, Gujja (kg811t) <kg811t@research.att.com>2018-09-25 13:59:56 -0400
committerKishore Reddy, Gujja (kg811t) <kg811t@research.att.com>2018-09-26 16:52:00 -0400
commita59bc3e85eaf33c0a38063e5c30fe890588a0eb1 (patch)
treeb19ba17d5dbd6cecc0b34c0ef6b158c088746384 /ecomp-portal-FE-common/client/app/views/tabs
parent4be6886a011ddbc4543e8c27b759a27ff3415c18 (diff)
login and Certman AAF Integration changes
Issue-ID: PORTAL-386, PORTAL-389 failed to create user with special char in login_id Change-Id: I415adf615a7af97319d8d11a740e75d3dfa11583 Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
Diffstat (limited to 'ecomp-portal-FE-common/client/app/views/tabs')
-rw-r--r--ecomp-portal-FE-common/client/app/views/tabs/tabframe.html10
-rw-r--r--ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js35
2 files changed, 35 insertions, 10 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html b/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html
index c7034edd..79dd0928 100644
--- a/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html
+++ b/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html
@@ -2,7 +2,7 @@
============LICENSE_START==========================================
ONAP Portal
===================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
===================================================================
Unless otherwise specified, all software contained herein is licensed
@@ -32,9 +32,9 @@
limitations under the License.
============LICENSE_END============================================
-
-
+
-->
<iframe id= "tabframe-{{tab.title.split(' ').join('-')}}" scrolling='yes' frameBorder='0' width='100%' class='tab-iframe'
-src='{{tab.content | trusted}}'
-></iframe> \ No newline at end of file
+src='' onLoad="loadFrame();"
+>
+</iframe> \ No newline at end of file
diff --git a/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js b/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js
index c4b31ef2..3e15144a 100644
--- a/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js
@@ -2,7 +2,7 @@
* ============LICENSE_START==========================================
* ONAP Portal
* ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -77,6 +77,7 @@
}
// Add tab to the end of the array
var addTab = function (title, content) {
+
if($scope.tabs.length===tabLimit){
//alert
confirmBoxService.showInformation('You have reached your maximum limit of tabs allowed.').then(isConfirmed => {});
@@ -279,11 +280,18 @@
restrict: "E",
templateUrl: 'app/views/tabs/tabframe.html',
link: function(scope, element) {
-
- //var iframeId = "#tabframe-" + scope.$parent.tab.title.split(' ').join('-');
+
+ var iframeId = "tabframe-" + scope.$parent.tab.title.split(' ').join('-');
+ var iframeVal = scope.$parent.tab.content;// + "| trusted";
+ if(iframeId != 'tabframe-Home') {
+ sessionStorage.setItem("currentTabFrameId",iframeId);
+ sessionStorage.setItem("currentTabFrameVal",iframeVal);
+ }
+ //console.log(document.getElementById(sessionStorage.getItem("currentTabFrameId")));
+
// jQuery(iframeId).load(function() {
- // alert("hello");
- // }); //.attr("src",'{{tab.content | trusted}}' ); //src='{{tab.content | trusted}}'
+ // alert("hello");
+ // }); //.attr("src",'{{tab.content | trusted}}' ); //src='{{tab.content | trusted}}'
// jQuery(iframeId).attr('src', '{{tab.content | trusted}}');
//element.childNodes[0].on('load', function() {
@@ -350,3 +358,20 @@ function isCascadeFrame(ref) {
window.location = "unKnownError";
}
}
+
+function loadFrame() {
+
+ var interval = setInterval(function() {
+
+ if(sessionStorage.getItem("currentTabFrameId") == null && sessionStorage.getItem("currentTabFrameVal") == null)
+ clearInterval(interval);
+ else if(document.getElementById(sessionStorage.getItem("currentTabFrameId")).src != sessionStorage.getItem("currentTabFrameVal")) {
+ document.getElementById(sessionStorage.getItem("currentTabFrameId")).src = sessionStorage.getItem("currentTabFrameVal");
+ sessionStorage.removeItem("currentTabFrameId");
+ sessionStorage.removeItem("currentTabFrameVal");
+ clearInterval(interval);
+ }
+ },1000);
+
+
+ }