From f06295559cdd722a0621682214599135cf8c095d Mon Sep 17 00:00:00 2001
From: Pruthviraj MS <pruthvims@juniper.net>
Date: Tue, 7 Mar 2017 18:13:04 +0530
Subject: [PATCH] Closes-Bug: #1670244 SM:UI:mainline3044: SM Setting page is
 blank Earlier jquery-dep-libs library got moved to thirdparty-libs to reduce
 the no of server calls made to the server during the web app load. The above
 stated problem occurs only when making serverManger REPO this was due the
 function call "layoutHandler.load(menuXML);" here this was getting executed
 only after "core-bundle" is loaded here "layoutHandler.load(menuXML);"
 requires "jquery.xml2json" library to convert xml to JSON this was moved to
 thirdparty-libs as stated above now this was causing the problem during the
 solo serverManger REPO during rendering UI pages.

FIX: making sure core-bundle & thirdparty-libs are loaded before executing the layoutHandler.load(menuXML);

Change-Id: I1cee733f822d2ffa12c043e3c7c47020bb20a823
---
 webroot/js/common/core.app.js        |  4 ++--
 webroot/js/common/thirdparty.libs.js | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/webroot/js/common/core.app.js b/webroot/js/common/core.app.js
index 77ab0d1df..5c0cfe734 100644
--- a/webroot/js/common/core.app.js
+++ b/webroot/js/common/core.app.js
@@ -319,7 +319,7 @@ var coreAppShim =  {
         deps: ['jquery']
     },
     'thirdparty-libs' : {
-        deps: ['jquery-ui', 'slick.core']
+        deps: ['jquery-ui']
     },
     'slickgrid-utils': {
         deps: ['jquery','slick.grid','slick.dataview']
@@ -1223,7 +1223,7 @@ if (typeof document !== 'undefined' && document) {
                     $.when.apply(window,[menuXMLLoadDefObj,layoutHandlerLoadDefObj]).done(function(menuXML) {
                         if(globalObj['featureAppDefObj'] == null)
                             globalObj['featureAppDefObj'] = $.Deferred();
-                        require(['core-bundle'],function() {
+                        require(['core-bundle','thirdparty-libs'],function() {
                             if(loadUtils.getCookie('region') != "All Regions")
                                 layoutHandler.load(menuXML);
                         });
diff --git a/webroot/js/common/thirdparty.libs.js b/webroot/js/common/thirdparty.libs.js
index b3429a231..6d9fac1dd 100644
--- a/webroot/js/common/thirdparty.libs.js
+++ b/webroot/js/common/thirdparty.libs.js
@@ -19,19 +19,10 @@ define([
         'jquery.panzoom',
         'jquery.event.drag',
         'jquery.datetimepicker',
-
         'slick.grid',
         'slick.checkboxselectcolumn',
         'slick.groupmetadata',
         'slick.rowselectionmodel',
-        
         'd3',
-        'nv.d3',
-        
-        
+        'nv.d3'
         ],function() {});
-
-
-
-        
-