Merge pull request #1198 from Kamidu/master

Changing the javascript to support IE
revert-70aa11f8
Rasika Perera 7 years ago committed by GitHub
commit eb01e72930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -145,7 +145,9 @@ function loadOperationsLog(update) {
$(row.child()).removeClass('log-data-row'); $(row.child()).removeClass('log-data-row');
tr.removeClass('shown'); tr.removeClass('shown');
} else { } else {
invokerUtil.get(uri,(payload) => { invokerUtil.get(uri, function (payload) {
} {
//update the parent status //update the parent status
var payloadObject = JSON.parse(payload); var payloadObject = JSON.parse(payload);
if ( payloadObject["activityStatus"][0]["status"] != rowData["status"] ) { if ( payloadObject["activityStatus"][0]["status"] != rowData["status"] ) {
@ -157,7 +159,7 @@ function loadOperationsLog(update) {
tr.find('i.fw-down').removeClass('fw-down').addClass('fw-up'); tr.find('i.fw-down').removeClass('fw-down').addClass('fw-up');
$(row.child()).addClass('log-data-row'); $(row.child()).addClass('log-data-row');
tr.addClass('shown'); tr.addClass('shown');
},(error) => { },function(error) {
},contentType); },contentType);
} }
@ -178,19 +180,17 @@ function loadOperationsLog(update) {
responseMsg = activityStatus['0'].responses['0'].response; responseMsg = activityStatus['0'].responses['0'].response;
} }
Object.entries(activityStatus).forEach( $. each (payload.activityStatus, function (key, entry) {
([key, entry]) => {
logStream += '<div class="row log-entry">' + logStream += '<div class="row log-entry">' +
'<div class="col-lg-8">' + '<div class="col-lg-8">' +
'<div class="log-status"><i class="icon fw ' + getLogStatusIcon(entry.status) + ' "></i>' + '<div class="log-status"><i class="icon fw ' + getLogStatusIcon(entry.status) + ' "></i>' +
'<span>' + ((responseMsg == null) ? entry.status : responseMsg) + '</span></div>' + '<span>' + entry.status + '</span></div>' +
'</div>' + '</div>' +
'<div class="col-lg-4">' + '<div class="col-lg-4">' +
'<div class="log-time text-right"><span>' + entry.updatedTimestamp + '</span></div>' + '<div class="log-time text-right"><span>' + entry.updatedTimestamp + '</span></div>' +
'</div>' + '</div>' +
'</div>'; '</div>';
} });
);
logStream += '</div></div>'; logStream += '</div></div>';
return logStream; return logStream;

Loading…
Cancel
Save