Skip to content

erp5
erp5
Commit 29224500 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_gadget_interface_validator] Remove not needed defer

parent 598bb3fe
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 138 deletions
bt5/erp5_gadget_interface_validator/PathTemplateItem/web_page_module/gadget_interface_js.js
View file @ 29224500
......@@ -85,17 +85,12 @@
}
function fetchAppcacheData(appcache_url) {
var defer = RSVP.defer();
return new RSVP.Queue()
.push(function () {
return ajax(appcache_url);
})
.push(function (xhr) {
var filename_list = xhr.responseText.split('\n');
return filename_list;
}, function (error) {
defer.reject(error);
return defer.promise;
return xhr.responseText.split('\n');
});
}
......@@ -136,7 +131,6 @@
}
function getInterfaceListFromURL(gadget_url) {
var defer = RSVP.defer();
return new RSVP.Queue()
.push(function () {
return ajax(gadget_url);
......@@ -165,16 +159,14 @@
}, function (error) {
var message = "Error with loading the gadget data.\n";
error.message = message + generateErrorMessage(error);
defer.reject(error);
return defer.promise;
throw error;
});
}
function verifyInterfaceDefinition(interface_url) {
//to verify if interface definition follows the correct template.
var error_message = "Interface definition is incorrect: " +
"One or more required tags are missing.",
defer = RSVP.defer();
"One or more required tags are missing.";
return new RSVP.Queue()
.push(function () {
return ajax(interface_url);
......@@ -192,7 +184,6 @@
if (dl_list[0].childElementCount !== 3 * method_len) {
throw new Error(error_message);
}
try {
for (i = 0; i < method_len; i += 1) {
if ((next_element === null) ||
(next_element.localName.toLowerCase() !== 'dt')) {
......@@ -226,32 +217,19 @@
}
next_element = next_element.nextElementSibling;
}
defer.resolve("Success");
} catch (error) {
defer.reject(error);
}
return defer.promise;
}, function (error) {
var message = "Error with loading the interface data.\n";
error.message = message + generateErrorMessage(error);
defer.reject(error);
return defer.promise;
throw error;
});
}
function verifyInterfaceDeclaration(interface_url, declared_interface_list) {
//to verify if gadget declares the interface.
var defer = RSVP.defer();
try {
if (declared_interface_list.indexOf(interface_url) > -1) {
defer.resolve("Success");
} else {
throw new Error("Interface is not declared.");
return "Success";
}
} catch (error) {
defer.reject(error);
}
return defer.promise;
throw new Error("Interface is not declared.");
}
/*
......@@ -320,8 +298,7 @@
function verifyAllMethodDeclared(interface_method_list, gadget_method_list) {
//to verify if all the interface methods are declared by the gadget.
var defer = RSVP.defer(),
gadget_method_name_list = gadget_method_list,
var gadget_method_name_list = gadget_method_list,
interface_method_name_list = [],
i,
j,
......@@ -331,7 +308,6 @@
for (i = 0; i < interface_method_list.length; i += 1) {
interface_method_name_list.push(interface_method_list[i].name);
}
try {
for (j = 0; j < interface_method_name_list.length; j += 1) {
if (gadget_method_name_list.indexOf(
interface_method_name_list[j]
......@@ -348,21 +324,16 @@
}
throw new Error(error_message);
}
defer.resolve("Success");
} catch (error) {
defer.reject(error);
}
return defer.promise;
return "Success";
}
function verifyAllMethod(interface_method_list, gadget_method_list) {
//to verify all methods of gadget and interface.
var defer = RSVP.defer();
return new RSVP.Queue()
.push(function () {
return verifyAllMethodDeclared(interface_method_list,
gadget_method_list[0]);
})
});
/* Commented till figure out the way to fetch the argument length of a
defined function.
.push(function() {
......@@ -370,55 +341,30 @@
gadget_method_list[1]);
})
*/
.push(function () {
defer.resolve("Success");
return defer.promise;
}, function (error) {
defer.reject(error);
return defer.promise;
});
}
rJS(window)
.ready(function (g) {
g.props = {};
})
.declareMethod("getVerifyGadget", function (gadget_url) {
var interface_gadget = this,
defer = RSVP.defer();
return new RSVP.Queue()
.push(function () {
var interface_gadget = this;
return interface_gadget.declareGadget(gadget_url, {
scope: gadget_url
});
})
.push(function () {
return interface_gadget.getDeclaredGadget(gadget_url);
}, function (error) {
var message = "Error with loading the gadget.\n";
error.message = message + error.message;
defer.reject(error);
return defer.promise;
throw error;
});
})
.declareMethod("getDeclaredGadgetInterfaceList", function (gadget_data) {
var defer = RSVP.defer();
return new RSVP.Queue()
.push(function () {
if (gadget_data.constructor === String) {
return getInterfaceListFromURL(gadget_data);
}
return gadget_data.getInterfaceList();
})
.push(function (interface_list) {
return interface_list;
}, function (error) {
defer.reject(error);
return defer.promise;
});
})
.declareMethod("getDeclaredGadgetMethodList", function (gadget) {
var declared_method_dict = {},
......@@ -443,27 +389,17 @@
})
.declareMethod("getGadgetListFromAppcache", function (appcache_url) {
var defer = RSVP.defer();
return new RSVP.Queue()
.push(function () {
return fetchAppcacheData(appcache_url);
})
.push(function (filename_list) {
return filterGadgetList(filename_list);
})
.push(function (filtered_gadget_list) {
return filtered_gadget_list;
}, function (error) {
defer.reject(error);
return defer.promise;
});
})
.declareMethod("getAbsoluteURL", function (gadget, url) {
return new RSVP.Queue()
.push(function () {
return gadget.getPath();
})
return gadget.getPath()
.push(function (base_url) {
return rJS.getAbsoluteURL(url, base_url);
});
......@@ -474,8 +410,7 @@
name: "",
description: "",
method_list: []
},
defer = RSVP.defer();
};
return new RSVP.Queue()
.push(function () {
return ajax(interface_url);
......@@ -483,9 +418,9 @@
.push(function (xhr) {
var doc = (new DOMParser()).parseFromString(xhr.responseText,
'text/html').body,
dl_list = doc.getElementsByTagName('dl'),
dt_list = doc.getElementsByTagName('dt'),
dd_list = doc.getElementsByTagName('dd'),
dl_list = doc.querySelectorAll('dl'),
dt_list = doc.querySelectorAll('dt'),
dd_list = doc.querySelectorAll('dd'),
method_len = dl_list.length - 1,
dt_count = 0,
dl_count = 1,
......@@ -494,16 +429,16 @@
argument_len,
j,
argument_item;
interface_data.name = doc.getElementsByTagName('h1')[0].innerHTML;
interface_data.name = doc.querySelector('h1').innerHTML;
interface_data.description =
doc.getElementsByTagName('h3')[0].innerHTML;
doc.querySelector('h3').innerHTML;
for (i = 0; i < method_len; i += 1) {
method = {
name: dt_list[dt_count].innerHTML,
description: dd_list[dt_count].innerHTML,
argument_list: []
};
argument_len = dl_list[dl_count].getElementsByTagName('dt')
argument_len = dl_list[dl_count].querySelectorAll('dt')
.length;
dt_count += 1;
dl_count += 1;
......@@ -524,19 +459,14 @@
}, function (error) {
var message = "Error with loading the interface data.\n";
error.message = message + generateErrorMessage(error);
defer.reject(error);
return defer.promise;
throw error;
});
})
.declareMethod("getDefinedInterfaceMethodList", function (interface_url) {
var defer = RSVP.defer();
return this.getInterfaceData(interface_url)
.push(function (interface_data) {
return interface_data.method_list;
}, function (error) {
defer.reject(error);
return defer.promise;
});
})
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7