Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
4a2e0583
Commit
4a2e0583
authored
Dec 06, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Launcher: reduce number of IndexedDB calls
Save all settings with one jIO put only.
parent
25745080
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
68 deletions
+63
-68
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+61
-66
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
4a2e0583
...
@@ -168,46 +168,14 @@
...
@@ -168,46 +168,14 @@
});
});
}
}
function
getSetting
(
gadget
,
key
,
default_value
)
{
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
jio_gadget
)
{
return
jio_gadget
.
get
(
"
setting
"
);
})
.
push
(
function
(
doc
)
{
return
doc
[
key
]
||
default_value
;
},
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
default_value
;
}
throw
error
;
});
}
function
setSetting
(
gadget
,
key
,
value
)
{
var
jio_gadget
;
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
result
)
{
jio_gadget
=
result
;
return
jio_gadget
.
get
(
"
setting
"
);
})
.
push
(
undefined
,
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
{};
}
throw
error
;
})
.
push
(
function
(
doc
)
{
doc
[
key
]
=
value
;
return
jio_gadget
.
put
(
'
setting
'
,
doc
);
});
}
//////////////////////////////////////////
//////////////////////////////////////////
// Page rendering
// Page rendering
//////////////////////////////////////////
//////////////////////////////////////////
rJS
(
window
)
rJS
(
window
)
.
ready
(
function
()
{
.
ready
(
function
()
{
var
gadget
=
this
;
var
gadget
=
this
,
setting_gadget
,
setting
;
this
.
props
=
{
this
.
props
=
{
loading_counter
:
0
,
loading_counter
:
0
,
content_element
:
this
.
element
.
querySelector
(
'
.gadget-content
'
)
content_element
:
this
.
element
.
querySelector
(
'
.gadget-content
'
)
...
@@ -215,14 +183,23 @@
...
@@ -215,14 +183,23 @@
// Configure setting storage
// Configure setting storage
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
jio_gadget
)
{
.
push
(
function
(
result
)
{
return
jio_gadget
.
createJio
({
setting_gadget
=
result
;
setting_gadget
.
createJio
({
type
:
"
indexeddb
"
,
type
:
"
indexeddb
"
,
database
:
"
setting
"
database
:
"
setting
"
});
});
})
.
push
(
function
()
{
return
setting_gadget
.
get
(
"
setting
"
)
.
push
(
undefined
,
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
{};
}
throw
error
;
});
})
.
push
(
function
(
result
)
{
setting
=
result
;
// Extract configuration parameters stored in HTML
// Extract configuration parameters stored in HTML
// XXX Will work only if top gadget...
// XXX Will work only if top gadget...
var
element_list
=
var
element_list
=
...
@@ -231,44 +208,30 @@
...
@@ -231,44 +208,30 @@
len
=
element_list
.
length
,
len
=
element_list
.
length
,
key
,
key
,
value
,
value
,
i
,
i
;
queue
=
new
RSVP
.
Queue
();
function
push
(
a
,
b
)
{
queue
.
push
(
function
()
{
return
setSetting
(
gadget
,
a
,
b
);
});
}
for
(
i
=
0
;
i
<
len
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
len
;
i
+=
1
)
{
key
=
element_list
[
i
].
getAttribute
(
'
data-renderjs-configuration
'
);
key
=
element_list
[
i
].
getAttribute
(
'
data-renderjs-configuration
'
);
value
=
element_list
[
i
].
textContent
;
value
=
element_list
[
i
].
textContent
;
gadget
.
props
[
key
]
=
value
;
gadget
.
props
[
key
]
=
value
;
push
(
key
,
value
)
;
setting
[
key
]
=
value
;
}
}
return
queue
;
})
.
push
(
function
()
{
// Calculate erp5 hateoas url
return
setSetting
(
gadget
,
'
hateoas_url
'
,
setting
.
hateoas_url
=
(
new
URI
(
gadget
.
props
.
hateoas_url
))
(
new
URI
(
gadget
.
props
.
hateoas_url
))
.
absoluteTo
(
location
.
href
)
.
absoluteTo
(
location
.
href
)
.
toString
()
.
toString
();
);
})
return
setting_gadget
.
put
(
"
setting
"
,
setting
);
})
.
push
(
function
()
{
.
push
(
function
()
{
// Configure jIO storage
// Configure jIO storage
return
RSVP
.
all
([
return
gadget
.
getDeclaredGadget
(
"
jio_gadget
"
);
gadget
.
getDeclaredGadget
(
"
jio_gadget
"
),
getSetting
(
gadget
,
'
jio_storage_description
'
)
]);
})
.
push
(
function
(
result_list
)
{
return
result_list
[
0
].
createJio
(
result_list
[
1
]);
})
})
.
push
(
function
()
{
.
push
(
function
(
jio_gadget
)
{
jio_gadget
.
createJio
(
setting
.
jio_storage_description
);
return
gadget
.
getDeclaredGadget
(
'
panel
'
);
return
gadget
.
getDeclaredGadget
(
'
panel
'
);
})
})
.
push
(
function
(
panel_gadget
)
{
.
push
(
function
(
panel_gadget
)
{
...
@@ -287,10 +250,42 @@
...
@@ -287,10 +250,42 @@
// Allow Acquisition
// Allow Acquisition
//////////////////////////////////////////
//////////////////////////////////////////
.
allowPublicAcquisition
(
"
getSetting
"
,
function
(
argument_list
)
{
.
allowPublicAcquisition
(
"
getSetting
"
,
function
(
argument_list
)
{
return
getSetting
(
this
,
argument_list
[
0
],
argument_list
[
1
]);
var
gadget
=
this
,
key
=
argument_list
[
0
],
default_value
=
argument_list
[
1
];
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
jio_gadget
)
{
return
jio_gadget
.
get
(
"
setting
"
);
})
.
push
(
function
(
doc
)
{
return
doc
[
key
]
||
default_value
;
},
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
default_value
;
}
throw
error
;
});
})
})
.
allowPublicAcquisition
(
"
setSetting
"
,
function
(
argument_list
)
{
.
allowPublicAcquisition
(
"
setSetting
"
,
function
(
argument_list
)
{
return
setSetting
(
this
,
argument_list
[
0
],
argument_list
[
1
]);
var
jio_gadget
,
gadget
=
this
,
key
=
argument_list
[
0
],
value
=
argument_list
[
1
];
return
gadget
.
getDeclaredGadget
(
"
setting_gadget
"
)
.
push
(
function
(
result
)
{
jio_gadget
=
result
;
return
jio_gadget
.
get
(
"
setting
"
);
})
.
push
(
undefined
,
function
(
error
)
{
if
(
error
.
status_code
===
404
)
{
return
{};
}
throw
error
;
})
.
push
(
function
(
doc
)
{
doc
[
key
]
=
value
;
return
jio_gadget
.
put
(
'
setting
'
,
doc
);
});
})
})
.
allowPublicAcquisition
(
"
translateHtml
"
,
function
(
argument_list
)
{
.
allowPublicAcquisition
(
"
translateHtml
"
,
function
(
argument_list
)
{
return
this
.
getDeclaredGadget
(
"
translation_gadget
"
)
return
this
.
getDeclaredGadget
(
"
translation_gadget
"
)
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
4a2e0583
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
955.
49842.36679.603
81
</string>
</value>
<value>
<string>
955.
51095.28081.354
81
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14810
29313.69
</float>
<float>
14810
33822.43
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment