Commit 5cc60ab5 authored by Tristan Cavelier's avatar Tristan Cavelier

Fix bug: conflict manager storage, unexistant function name fixed

parent 11be241f
...@@ -1785,7 +1785,7 @@ var newConflictManagerStorage = function ( spec, my ) { ...@@ -1785,7 +1785,7 @@ var newConflictManagerStorage = function ( spec, my ) {
var cloned_option = command.cloneOption (); var cloned_option = command.cloneOption ();
cloned_option.metadata_only = true; cloned_option.metadata_only = true;
cloned_option.error = function (error) { cloned_option.error = function (error) {
am.call(o,'fail',[error]); am.call(o,'error',[error]);
}; };
cloned_option.success = function (result) { cloned_option.success = function (result) {
am.call(o,'filterTheList',[result]); am.call(o,'filterTheList',[result]);
......
This diff is collapsed.
...@@ -552,7 +552,7 @@ var newConflictManagerStorage = function ( spec, my ) { ...@@ -552,7 +552,7 @@ var newConflictManagerStorage = function ( spec, my ) {
var cloned_option = command.cloneOption (); var cloned_option = command.cloneOption ();
cloned_option.metadata_only = true; cloned_option.metadata_only = true;
cloned_option.error = function (error) { cloned_option.error = function (error) {
am.call(o,'fail',[error]); am.call(o,'error',[error]);
}; };
cloned_option.success = function (result) { cloned_option.success = function (result) {
am.call(o,'filterTheList',[result]); am.call(o,'filterTheList',[result]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment