Commit bd02080c authored by Boris Kocherov's avatar Boris Kocherov Committed by Boris Kocherov

Revert "erp5_officejs: speedup loading application use only one jio request for *.js files"

This reverts commit 430f3245.
parent ab2b9d40
...@@ -253,32 +253,20 @@ var global = self, ...@@ -253,32 +253,20 @@ var global = self,
var find_queue; var find_queue;
if (url_string !== undefined) { if (url_string !== undefined) {
erp5_id = 'web_page_module/' + url_string.replace(/\//g, '_').replace(/\./g, '_'); erp5_id = 'web_page_module/' + url_string.replace(/\//g, '_').replace(/\./g, '_');
if (erp5_id.endsWith('_js')) { find_queue = storage.get(erp5_id)
// for *.js files use only one request to jio .push(function (doc) {
// bypass metadata request doc.id = erp5_id;
find_queue = RSVP.Queue() return doc;
.push(function () { })
return { .push(undefined, function (error) {
id: erp5_id, if (error.status_code === 404) {
portal_type: "Web Script" return find_and_get({
}; query: query_portal_types + ' AND (url_string: ="' + url_string + '")'
}); }, storage);
} else { } else {
find_queue = storage.get(erp5_id) throw error;
.push(function (doc) { }
doc.id = erp5_id; });
return doc;
})
.push(undefined, function (error) {
if (error.status_code === 404) {
return find_and_get({
query: query_portal_types + ' AND (url_string: ="' + url_string + '")'
}, storage);
} else {
throw error;
}
});
}
if (!self.jio_cache.development_mode) { if (!self.jio_cache.development_mode) {
find_queue = find_queue find_queue = find_queue
.push(undefined, function (error) { .push(undefined, function (error) {
......
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>953.28310.57522.44253</string> </value> <value> <string>953.27946.16374.60296</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1471975157.32</float> <float>1471953747.55</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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