Skip to content

Commit

Permalink
fixup! Fixes #17776: When removing and adding a new method, the save …
Browse files Browse the repository at this point in the history
…button is disabled

Fixes #17776: When removing and adding a new method, the save button is disabled
  • Loading branch information
VinceMacBuche committed Jun 22, 2020
1 parent d9b74fe commit 68a653b
Showing 1 changed file with 21 additions and 17 deletions.
38 changes: 21 additions & 17 deletions builder/js/ncf.js
Original file line number Diff line number Diff line change
Expand Up @@ -1577,24 +1577,28 @@ $scope.onImportFileChange = function (fileEl) {
var diffParams = false;
var st_params, ct_params;
for(var i=0; i<st.length; i++){
//Remove some properties that we don't want to compare
delete st[i].agent_support;
delete ct[i].agent_support;
delete st[i].promiser;
delete ct[i].promiser;
if(st[i].OS_class.minorVersion === undefined) delete st[i].OS_class.minorVersion;
if(st[i].OS_class.majorVersion === undefined) delete st[i].OS_class.majorVersion;
if(ct[i].OS_class.minorVersion === undefined) delete ct[i].OS_class.minorVersion;
if(ct[i].OS_class.majorVersion === undefined) delete ct[i].OS_class.majorVersion;
//Store parameters to compare them separetly
st_params = st[i].parameters;
delete st[i].parameters;
ct_params = ct[i].parameters;
delete ct[i].parameters;
for(var p in st_params){
if(st_params[p].value != ct_params[p].value){
diffParams = true;
if (st[i].method_name === ct[i].method_name) {
//Remove some properties that we don't want to compare
delete st[i].agent_support;
delete ct[i].agent_support;
delete st[i].promiser;
delete ct[i].promiser;
if(st[i].OS_class.minorVersion === undefined) delete st[i].OS_class.minorVersion;
if(st[i].OS_class.majorVersion === undefined) delete st[i].OS_class.majorVersion;
if(ct[i].OS_class.minorVersion === undefined) delete ct[i].OS_class.minorVersion;
if(ct[i].OS_class.majorVersion === undefined) delete ct[i].OS_class.majorVersion;
//Store parameters to compare them separetly
st_params = st[i].parameters;
delete st[i].parameters;
ct_params = ct[i].parameters;
delete ct[i].parameters;
for(var p in st_params){
if(st_params[p].value != ct_params[p].value){
diffParams = true;
}
}
} else {
diffParams = true
}
}
diff = diffParams || !angular.equals(st , ct);
Expand Down

0 comments on commit 68a653b

Please sign in to comment.