From 60e7ca3a61f161d97ed1f0c7140686e272fac8c1 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Tue, 22 Nov 2016 15:34:31 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Simplify tab/action pages
---
.../rjs_gadget_erp5_pt_actionpage_js.js | 23 +++----------------
.../rjs_gadget_erp5_pt_actionpage_js.xml | 4 ++--
.../rjs_gadget_erp5_pt_tabpage_js.js | 23 +++----------------
.../rjs_gadget_erp5_pt_tabpage_js.xml | 4 ++--
4 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js
index fdc84d1699..be54c01f4a 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.js
@@ -8,28 +8,11 @@
/////////////////////////////////////////////////////////////////
// Precompile the templates while loading the first gadget instance
var gadget_klass = rJS(window),
- source = gadget_klass.__template_element
+ table_template = Handlebars.compile(gadget_klass.__template_element
.getElementById("table-template")
- .innerHTML,
- table_template = Handlebars.compile(source);
+ .innerHTML);
gadget_klass
- /////////////////////////////////////////////////////////////////
- // ready
- /////////////////////////////////////////////////////////////////
- // Init local properties
- .ready(function (g) {
- g.props = {};
- })
-
- // Assign the element to a variable
- .ready(function (g) {
- return g.getElement()
- .push(function (element) {
- g.props.element = element;
- });
- })
-
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
@@ -131,7 +114,7 @@
]);
})
.push(function (last_result_list) {
- gadget.props.element.innerHTML = last_result_list[0];
+ gadget.element.innerHTML = last_result_list[0];
return gadget.updateHeader({
back_url: result_list[0],
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml
index d66cee4602..0902749951 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_actionpage_js.xml
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>950.28791.23999.5956</string> </value>
+ <value> <string>955.29509.41156.45721</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1460380327.89</float>
+ <float>1479825199.32</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js
index 0801abac04..60cc7a2b69 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js
@@ -8,28 +8,11 @@
/////////////////////////////////////////////////////////////////
// Precompile the templates while loading the first gadget instance
var gadget_klass = rJS(window),
- source = gadget_klass.__template_element
+ table_template = Handlebars.compile(gadget_klass.__template_element
.getElementById("table-template")
- .innerHTML,
- table_template = Handlebars.compile(source);
+ .innerHTML);
gadget_klass
- /////////////////////////////////////////////////////////////////
- // ready
- /////////////////////////////////////////////////////////////////
- // Init local properties
- .ready(function (g) {
- g.props = {};
- })
-
- // Assign the element to a variable
- .ready(function (g) {
- return g.getElement()
- .push(function (element) {
- g.props.element = element;
- });
- })
-
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
@@ -158,7 +141,7 @@
}));
})
.push(function (my_translated_html) {
- gadget.props.element.innerHTML = my_translated_html;
+ gadget.element.innerHTML = my_translated_html;
return RSVP.all([
gadget.getUrlFor({command: 'change', options: {
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml
index fed8a88775..23d0a52bab 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>950.28781.23028.58368</string> </value>
+ <value> <string>955.29510.26421.23705</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1460380878.05</float>
+ <float>1479825091.01</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9