Commit caeee0e1 authored by Vincent Bechu's avatar Vincent Bechu

[erp5_officejs] Bootloader, remove unnecessary if statement

/reviewed-on nexedi/erp5!474
parent 459e0ee7
......@@ -47,13 +47,10 @@ var global = self, window = self;
});
self.addEventListener("fetch", function (event) {
var relative_url = event.request.url.split("#")[0]
var relative_url = './' + event.request.url.split("#")[0]
.replace(self.registration.scope, "")
.replace(self.version_url, "");
if (relative_url === "") {
relative_url = "/";
}
if (relative_url === 'no-cache') {
if (relative_url === './no-cache') {
event.respondWith(new Response(self.cache_list));
return;
}
......
......@@ -213,7 +213,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
<value> <string>vincent</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -227,7 +227,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>961.30858.43041.57309</string> </value>
<value> <string>963.3430.40377.1177</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -245,7 +245,7 @@
</tuple>
<state>
<tuple>
<float>1502980874.99</float>
<float>1509458653.61</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -13,12 +13,12 @@
spec.origin_url : window.location.href;
this._version = spec.version || "";
this._gadget_list = [];
this._prefix = spec.prefix || "";
this._prefix = spec.prefix || "./";
this._documents = {};
// Harcoded here, find a better way.
if (this._take_installer) {
this._relative_url_list = [
this._prefix + "/",
this._prefix,
this._prefix + "gadget_officejs_bootloader.js",
this._prefix + "gadget_officejs_bootloader_presentation.html",
this._prefix + "gadget_officejs_bootloader_presentation.js",
......@@ -57,9 +57,6 @@
return new Blob([]);
});
}
if (relative_url === '/') {
relative_url = '';
}
return new RSVP.Queue()
.push(function () {
return jIO.util.ajax({
......
......@@ -225,7 +225,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
<value> <string>vincent</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -239,7 +239,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.8873.18455.40004</string> </value>
<value> <string>963.9196.27669.54835</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -257,7 +257,7 @@
</tuple>
<state>
<tuple>
<float>1509439359.17</float>
<float>1509459715.1</float>
<string>UTC</string>
</tuple>
</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