From 1900a7cf4eae6190ad6bfd5f1c3ebb2e4c8fbd3b Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Thu, 10 Jun 2010 11:50:52 +0000 Subject: [PATCH] Group all JavaScript code in one file. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36218 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../km_js/erp5_km.js.xml} | 22 +++++-- .../erp5_km_theme/km_js/switch.js.xml | 59 ------------------- .../template_erp5_km_minimal.xml | 3 +- bt5/erp5_km/bt/revision | 2 +- 4 files changed, 19 insertions(+), 67 deletions(-) rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km/erp5_km_utils.js.xml => erp5_km_theme/km_js/erp5_km.js.xml} (80%) delete mode 100644 bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/switch.js.xml diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/erp5_km_utils.js.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml similarity index 80% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/erp5_km_utils.js.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml index 63f8b21bbb..fb84405cb1 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/erp5_km_utils.js.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/erp5_km.js.xml @@ -15,11 +15,11 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts69348961.48</string> </value> + <value> <string>ts76170392.93</string> </value> </item> <item> <key> <string>__name__</string> </key> - <value> <string>erp5_km_utils.js</string> </value> + <value> <string>erp5_km.js</string> </value> </item> <item> <key> <string>content_type</string> </key> @@ -27,7 +27,8 @@ </item> <item> <key> <string>data</string> </key> - <value> <string>\n + <value> <string encoding="cdata"><![CDATA[ + // Browser gadget toggle section\n function toggleSection(section_id, image_id){\n section_obj = getElement(section_id);\n @@ -62,7 +63,18 @@ function toggleDocumentDetailsPopupWindow(dom_id, show, url){\n dom_element.style.display=\'none\';\n }\n }\n -</string> </value> +\n +MochiKit.DOM.addLoadEvent(setScreenClass);\n +connect(window, "onresize", setScreenClass);\n +\n +function setScreenClass(){\n + var fmt = document.documentElement.clientWidth;\n + var cls = (fmt<=800)?\'screen_small\':(fmt>800)?\'screen_wide\':\'screen_small\';\n + document.body.className=cls;\n +};\n + + +]]></string> </value> </item> <item> <key> <string>precondition</string> </key> @@ -70,7 +82,7 @@ function toggleDocumentDetailsPopupWindow(dom_id, show, url){\n </item> <item> <key> <string>size</string> </key> - <value> <long>1041</long> </value> + <value> <int>1319</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/switch.js.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/switch.js.xml deleted file mode 100644 index 842569e4c0..0000000000 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_js/switch.js.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="File" module="OFS.Image"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_Cacheable__manager_id</string> </key> - <value> <string>http_cache</string> </value> - </item> - <item> - <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts49562786.25</string> </value> - </item> - <item> - <key> <string>__name__</string> </key> - <value> <string>switch.js</string> </value> - </item> - <item> - <key> <string>content_type</string> </key> - <value> <string>application/javascript</string> </value> - </item> - <item> - <key> <string>data</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -MochiKit.DOM.addLoadEvent(setScreenClass);\n -connect(window, "onresize", setScreenClass);\n -\n -function setScreenClass(){\n - var fmt = document.documentElement.clientWidth;\n - var cls = (fmt<=800)?\'screen_small\':(fmt>800)?\'screen_wide\':\'screen_small\';\n - document.body.className=cls;\n -};\n - - -]]></string> </value> - </item> - <item> - <key> <string>precondition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <long>278</long> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml index f2d09c7fd4..147bceece9 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml @@ -123,8 +123,7 @@ \'%s/km_custom.css\' % portal_path,\n ];\n global js_list python:[\n - \'%s/erp5_km_utils.js\' % portal_path,\n - \'%s/km_js/switch.js\' % portal_path,\n + \'%s/km_js/erp5_km.js\' % portal_path,\n ]">\n <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n <tal:block metal:fill-slot="layout">\n diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 37a71f925f..2a915b96ae 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1442 \ No newline at end of file +1443 \ No newline at end of file -- 2.30.9