updated tinymce to solve failed init issue.

21ecd8b4 · Vivek · a4da3a11 · 21ecd8b4 · 21ecd8b4
Commit 21ecd8b4 authored Sep 15, 2015 by Vivek
2 changed files
--- a/bt5/erp5_web_editor_demo/PathTemplateItem/web_page_module/interface_gadget_tinymce_html.xml
+++ b/bt5/erp5_web_editor_demo/PathTemplateItem/web_page_module/interface_gadget_tinymce_html.xml
@@ -115,10 +115,10 @@
 \n
    <link rel="http://www.renderjs.org/rel/interface" href="editor_interface.html"></link>\n
 \n
-    <script src="tinymce/js/tinymce/tinymce.js"></script>\n
    <script src="jquery.js"></script>\n
    <script src="rsvp.js"></script>\n
    <script src="renderjs.js"></script>\n
+    <script src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>\n
    <script src="interface_gadget_tinymce.js" type="text/javascript"></script>\n
  </head>\n
  <body>\n
@@ -264,7 +264,7 @@
            </item>
            <item>
                <key> <string>serial</string> </key>
-                <value> <string>945.33600.34754.53230</string> </value>
+                <value> <string>945.40798.17513.32324</string> </value>
            </item>
            <item>
                <key> <string>state</string> </key>
@@ -282,7 +282,7 @@
                    </tuple>
                    <state>
                      <tuple>
-                        <float>1441353714.75</float>
+                        <float>1441787790.36</float>
                        <string>GMT</string>
                      </tuple>
                    </state>

--- a/bt5/erp5_web_editor_demo/PathTemplateItem/web_page_module/interface_gadget_tinymce_js.xml
+++ b/bt5/erp5_web_editor_demo/PathTemplateItem/web_page_module/interface_gadget_tinymce_js.xml
@@ -100,20 +100,23 @@
        <item>
            <key> <string>text_content</string> </key>
            <value> <string>/*jslint indent: 2 */\n
-/*global window, jQuery, rJS, RSVP*/\n
+/*global window, jQuery, rJS, RSVP, tinymce*/\n
 "use strict";\n
 \n
 (function (window, $, rJS, RSVP) {\n
 \n
  rJS(window).\n
    declareMethod(\'getContent\', function () {\n
+      var gadget = this;\n
      return tinymce.activeEditor.getContent();\n
    })\n
    .declareMethod(\'setContent\', function (content) {\n
+      var gadget = this;\n
      return tinymce.activeEditor.setContent(content);\n
    })\n
    .declareMethod(\'clearContent\', function () {\n
-      return tinymce.activeEditor.setContent(\'\');\n
+      var gadget = this;\n
+      return gadget.props.editor.setContent(\'\');\n
    })\n
    .declareMethod(\'initStateTransfer\', function () {\n
      var current_state = {},\n
@@ -128,11 +131,10 @@
        });\n
    })\n
    .declareMethod(\'finishStateTransfer\', function (current_state) {\n
-      return this.setContent(current_state.content);\n
+      return this.setContent(current_state.content);co\n
    })\n
    .declareMethod(\'initSubGadget\', function () {\n
-      this.editor = $(\'.textarea\');\n
-      tinymce.init({\n
+      return tinymce.init({\n
        selector: "#mytextarea",\n
        theme: "modern",\n
        width: \'100%\',\n
@@ -151,11 +153,12 @@
             {title: \'Example 2\', inline: \'span\', classes: \'example2\'},\n
             {title: \'Table styles\'},\n
             {title: \'Table row 1\', selector: \'tr\', classes: \'tablerow1\'}\n
-          ]      \n
+          ]\n
      });\n
    })\n
 \n
    .ready(function (g) {\n
+      g.props = {};\n
    });\n
 \n
 }(window, jQuery, rJS, RSVP));\n
@@ -294,7 +297,7 @@
            </item>
            <item>
                <key> <string>serial</string> </key>
-                <value> <string>945.33593.23703.31453</string> </value>
+                <value> <string>945.40809.19530.56627</string> </value>
            </item>
            <item>
                <key> <string>state</string> </key>
@@ -312,7 +315,7 @@
                    </tuple>
                    <state>
                      <tuple>
-                        <float>1441353720.28</float>
+                        <float>1441787867.6</float>
                        <string>GMT</string>
                      </tuple>
                    </state>