From f2f6c715d0bd2b3fdc9808095407b2480fd0316b Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Mon, 29 May 2017 14:16:46 +0000 Subject: [PATCH] [erp5_officejs_afs_directory] Drop not needed code --- .../gadget_erp5_afs_appcache.xml | 6 +-- .../gadget_erp5_afs_panel_js.js | 39 +++++-------------- .../gadget_erp5_afs_panel_js.xml | 4 +- .../gadget_erp5_afs_router_js.js | 8 ---- .../gadget_erp5_afs_router_js.xml | 4 +- .../gadget_erp5_page_afs_directory_js.js | 21 +--------- .../gadget_erp5_page_afs_directory_js.xml | 4 +- .../gadget_erp5_page_afs_publisher_js.js | 10 +---- .../gadget_erp5_page_afs_publisher_js.xml | 4 +- .../gadget_erp5_page_afs_publisher_list_js.js | 7 ---- ...gadget_erp5_page_afs_publisher_list_js.xml | 4 +- .../gadget_erp5_page_afs_software_js.js | 10 +---- .../gadget_erp5_page_afs_software_js.xml | 4 +- .../gadget_erp5_page_afs_software_list_js.js | 7 ---- .../gadget_erp5_page_afs_software_list_js.xml | 4 +- .../gadget_erp5_page_afs_success_case_js.js | 10 +---- .../gadget_erp5_page_afs_success_case_js.xml | 4 +- ...dget_erp5_page_afs_success_case_list_js.js | 7 ---- ...get_erp5_page_afs_success_case_list_js.xml | 4 +- 19 files changed, 34 insertions(+), 127 deletions(-) diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_appcache.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_appcache.xml index c3655ab77a..a77f0e5323 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_appcache.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_appcache.xml @@ -106,7 +106,7 @@ <value> <string encoding="cdata"><![CDATA[ CACHE MANIFEST\n -# generated on Mon, 29 May 2017 09:00:00 GMT\n +# generated on Mon, 29 May 2017 10:00:00 GMT\n # images/ajax-loader.gif\n CACHE:\n font-awesome/font-awesome-webfont.eot?v=4.6.3\n @@ -316,7 +316,7 @@ NETWORK:\n </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45244.54157.64750</string> </value> + <value> <string>959.45264.30637.35123</string> </value> </item> <item> <key> <string>state</string> </key> @@ -334,7 +334,7 @@ NETWORK:\n </tuple> <state> <tuple> - <float>1496066148.93</float> + <float>1496067282.1</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.js index 4c4129ddf0..54a68a94c7 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.js @@ -18,14 +18,6 @@ panel_template_body = Handlebars.compile(source_body); gadget_klass - ///////////////////////////////////////////////////////////////// - // ready - ///////////////////////////////////////////////////////////////// - // Init local properties - .ready(function (g) { - g.props = {}; - }) - .setState({ visible: false, desktop: false @@ -37,15 +29,6 @@ .declareAcquiredMethod("translateHtml", "translateHtml") .declareAcquiredMethod("getUrlFor", "getUrlFor") - // Assign the element to a variable - .ready(function (g) { - return g.getElement() - .push(function (element) { - g.props.element = element; - g.props.render_deferred = RSVP.defer(); - }); - }) - ///////////////////////////////////////////////////////////////// // declared methods ///////////////////////////////////////////////////////////////// @@ -75,19 +58,15 @@ .push(function (all_result) { // XXX: Customize panel header! - var tmp = panel_template_header(); - tmp += panel_template_body({ - "directory_href": all_result[0], - "publisher_statistic_href": all_result[1], - "publisher_href": all_result[2], - "software_href": all_result[3], - "success_case_href": all_result[4] - }); - return tmp; - }) - .push(function (my_translated_or_plain_html) { - g.props.element.querySelector("div").innerHTML = my_translated_or_plain_html; - g.props.render_deferred.resolve(); + var tmp = panel_template_header() + + panel_template_body({ + "directory_href": all_result[0], + "publisher_statistic_href": all_result[1], + "publisher_href": all_result[2], + "software_href": all_result[3], + "success_case_href": all_result[4] + }); + g.element.querySelector("div").innerHTML = tmp; }); }) diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.xml index a31c4e75cd..113ca6ff40 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_panel_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45016.12856.26658</string> </value> + <value> <string>959.45262.19816.34594</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496052034.32</float> + <float>1496066838.57</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.js index 61e61f5908..d46305efb4 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.js @@ -4,14 +4,6 @@ "use strict"; rJS(window) - ///////////////////////////////////////////////////////////////// - // ready - ///////////////////////////////////////////////////////////////// - // Init local properties - .ready(function (g) { - g.props = {}; - }) - /* .ready(function (g) { return g.getDeclaredGadget("router") diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.xml index af33bf5830..569b22dde4 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_afs_router_js.xml @@ -234,7 +234,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45015.31491.22801</string> </value> + <value> <string>959.45017.10197.48298</string> </value> </item> <item> <key> <string>state</string> </key> @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1496052069.31</float> + <float>1496066978.7</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.js index 4b458b99a8..9fa0d6e678 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.js @@ -15,25 +15,6 @@ ); 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; - }) - - .push(undefined, function (error) { - console.log(error); - }); - }) .declareAcquiredMethod("updateHeader", "updateHeader") .declareAcquiredMethod("jio_allDocs", "jio_allDocs") @@ -42,7 +23,7 @@ ///////////////////////////////////////////////////////////////// .declareMethod("render", function () { var gadget = this, - masonry_container = gadget.props.element.querySelector( + masonry_container = gadget.element.querySelector( '.ui-masonry-container' ); diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.xml index 314896d09d..c96cac56ad 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_directory_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45141.9554.30549</string> </value> + <value> <string>959.45141.39910.35703</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496059536.49</float> + <float>1496067047.69</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.js index 6ca77ffd6c..ed9754e42f 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.js @@ -24,14 +24,6 @@ } rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) - .declareAcquiredMethod('updateHeader', 'updateHeader') .declareAcquiredMethod('jio_get', 'jio_get') @@ -103,7 +95,7 @@ }); }) .push(function (my_publisher) { - gadget.props.element.querySelector(".display-widget") + gadget.element.querySelector(".display-widget") .innerHTML = display_widget_table(my_publisher); return gadget.updateHeader({page_title: my_publisher.title}); diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.xml index 86ea209ed9..64a58e798d 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45178.38571.47086</string> </value> + <value> <string>959.45186.37882.22272</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496062234.66</float> + <float>1496067089.61</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.js index f06f2b9fb2..540803f005 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.js @@ -4,13 +4,6 @@ (function (window, RSVP, rJS) { "use strict"; rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) .declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlParameter", "getUrlParameter") diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.xml index bbefdff642..ca93dce0ad 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_publisher_list_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45150.63557.44714</string> </value> + <value> <string>959.45151.41449.24985</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496060137.94</float> + <float>1496067110.92</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.js index 8fb84d17d4..671ebe74cc 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.js @@ -29,14 +29,6 @@ } rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) - .declareAcquiredMethod('updateHeader', 'updateHeader') .declareAcquiredMethod('jio_get', 'jio_get') @@ -98,7 +90,7 @@ }) .push(function (my_software) { - gadget.props.element.querySelector(".display-widget") + gadget.element.querySelector(".display-widget") .innerHTML = display_widget_table(my_software); return gadget.updateHeader({page_title: my_software.title}); diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.xml index 5efcb7267f..5ab67421d6 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45179.11177.20104</string> </value> + <value> <string>959.45186.59501.25241</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496062254.42</float> + <float>1496067144.61</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.js index c66103a0c5..d414dd5c3e 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.js @@ -4,13 +4,6 @@ (function (window, RSVP, rJS) { "use strict"; rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) .declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlParameter", "getUrlParameter") diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.xml index 693f44dc6e..c0cff1caea 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_software_list_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45114.28192.42308</string> </value> + <value> <string>959.45114.42947.5734</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496057919.27</float> + <float>1496067168.05</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.js index 6f789a621e..32fd69abed 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.js @@ -10,14 +10,6 @@ ); rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) - .declareAcquiredMethod('updateHeader', 'updateHeader') .declareAcquiredMethod('jio_get', 'jio_get') @@ -33,7 +25,7 @@ story.image_class = "custom-placeholder"; } - gadget.props.element.querySelector(".display-widget") + gadget.element.querySelector(".display-widget") .innerHTML = display_widget_table(story); return gadget.updateHeader({page_title: story.title}); }); diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.xml index ce7ee21151..890c4bca41 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45179.45629.45585</string> </value> + <value> <string>959.45187.8875.24320</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496062268.1</float> + <float>1496067187.24</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.js b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.js index fe5735db73..82904f7e43 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.js +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.js @@ -3,13 +3,6 @@ (function (window, RSVP, rJS) { "use strict"; rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) .declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlParameter", "getUrlParameter") diff --git a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.xml b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.xml index 86c9a6bb03..fa827c9f33 100644 --- a/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.xml +++ b/bt5/erp5_officejs_afs_directory/PathTemplateItem/web_page_module/gadget_erp5_page_afs_success_case_list_js.xml @@ -228,7 +228,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.45121.21336.33467</string> </value> + <value> <string>959.45122.5485.9130</string> </value> </item> <item> <key> <string>state</string> </key> @@ -246,7 +246,7 @@ </tuple> <state> <tuple> - <float>1496058364.96</float> + <float>1496067205.22</float> <string>UTC</string> </tuple> </state> -- 2.30.9