Skip to content

Commit

Permalink
Closes-Bug: #1670244 SM:UI:mainline3044: SM Setting page is blank
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Pruthviraj MS committed Mar 10, 2017
1 parent 0f64015 commit f062955
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
4 changes: 2 additions & 2 deletions webroot/js/common/core.app.js
Expand Up @@ -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']
Expand Down Expand Up @@ -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);
});
Expand Down
11 changes: 1 addition & 10 deletions webroot/js/common/thirdparty.libs.js
Expand Up @@ -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() {});





0 comments on commit f062955

Please sign in to comment.