diff --git a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/Base_getTextContentWrapper.xml b/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/Base_getTextContentWrapper.xml deleted file mode 100644 index b81bb5312dadd8027a66f2bfe536ad80db7994a6..0000000000000000000000000000000000000000 --- a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/Base_getTextContentWrapper.xml +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>"""\n - Script used by JavaScript to get the text of document.\n - This way is used to the JavaScript insert the data in SVG Editor.\n -"""\n -return context.getTextContent()\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>_getattr_</string> - <string>context</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Base_getTextContentWrapper</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/WebIllustration_renderSVGEditor.xml b/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/WebIllustration_renderSVGEditor.xml deleted file mode 100644 index 70ea5bd3f69d78761c56ae4850d45daf854261cc..0000000000000000000000000000000000000000 --- a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/WebIllustration_renderSVGEditor.xml +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -html = """\n -<iframe name="svgframe" id="svgframe" \n - src="portal_skins/erp5_jquery/plugin/svg-editor/svg-editor.html?url=%s" width="750" height="600"/> \n -""" % ("%s/getTextContent" % context.getRelativeUrl())\n -\n -return html\n - - -]]></string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>_getattr_</string> - <string>context</string> - <string>html</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>WebIllustration_renderSVGEditor</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg-editor.erp5.js.xml b/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg-editor.erp5.js.xml index 3dbc2fe565f620e95e35ab23355cc7716c36b396..ab24ce49f1934066cfe04beb6e1ce5d384730c3b 100644 --- a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg-editor.erp5.js.xml +++ b/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg-editor.erp5.js.xml @@ -50,7 +50,7 @@ });\n svg_canvas = window.frames["svgframe"].svgCanvas;\n var text_content = $.ajax({\n - url: "Base_getTextContentWrapper",\n + url: "getTextContent",\n async: false\n }).responseText;\n svg_canvas.setSvgString(text_content);\n diff --git a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg_edit_form_view.xml b/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg_edit_form_view.xml index e9cb0579dd4e859cb69b55df46db5ee3b97277c2..a0bfef71bd397919c74f4abf2445a0bf7dd88eb9 100644 --- a/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg_edit_form_view.xml +++ b/bt5/erp5_svg_editor/SkinTemplateItem/portal_skins/erp5_svg_editor/svg_edit_form_view.xml @@ -40,15 +40,9 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n <tal:block metal:define-macro="master"\n - tal:define="css_list_jquery_template python:[\'portal_skins/erp5_jquery/plugin/jgraduate/css/jPicker-1.0.12.css\',\n - \'portal_skins/erp5_jquery/plugin/jgraduate/css/jgraduate.css\',\n - \'portal_skins/erp5_jquery/plugin/svg-editor/svg-editor.css\',\n - \'portal_skins/erp5_jquery/plugin/spinbtn/JQuerySpinBtn.css\',\n -];\n - js_list_jquery_template python: [\'svg-editor.erp5.js\'];\n - global css_list css_list | python:[];\n + tal:define="js_list_jquery_template python: [\'portal_skins/erp5_jquery/core/jquery.js\',\n + \'svg-editor.erp5.js\'];\n global js_list js_list | python:[];\n - dummy python:css_list.extend(css_list_jquery_template);\n dummy python:js_list.extend(js_list_jquery_template);">\n <tal:block metal:use-macro="here/view_main/macros/master">\n <tal:block metal:fill-slot="main">\n diff --git a/bt5/erp5_svg_editor/bt/revision b/bt5/erp5_svg_editor/bt/revision index ca7bf83ac53a27a2a914bed25e1a07478dd8ef47..da2d3988d7d1a255376770b1e87394ebb42febb3 100644 --- a/bt5/erp5_svg_editor/bt/revision +++ b/bt5/erp5_svg_editor/bt/revision @@ -1 +1 @@ -13 \ No newline at end of file +14 \ No newline at end of file