update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / autosave / editor_plugin_src.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
old mode 100755 (executable)
new mode 100644 (file)
index d8cc112..8311483
--- a/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -106,7 +106,7 @@
                        ed.addButton(RESTORE_DRAFT, {\r
                                title : PLUGIN_NAME + ".restore_content",\r
                                onclick : function() {\r
-                                       if (ed.getContent().replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {\r
+                                       if (ed.getContent({draft: true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {\r
                                                // Show confirm dialog if the editor isn't empty\r
                                                ed.windowManager.confirm(\r
                                                        PLUGIN_NAME + ".warning_message",\r
@@ -257,15 +257,24 @@
 \r
                                                                userDataElement.setAttribute(key, value);\r
                                                                userDataElement.expires = self.getExpDate();\r
-                                                               userDataElement.save("TinyMCE");\r
+\r
+                                                               try {\r
+                                                                       userDataElement.save("TinyMCE");\r
+                                                               } catch (e) {\r
+                                                                       // Ignore, saving might fail if "Userdata Persistence" is disabled in IE\r
+                                                               }\r
                                                        },\r
 \r
                                                        getItem : function(key) {\r
                                                                var userDataElement = ed.getElement();\r
 \r
-                                                               userDataElement.load("TinyMCE");\r
-\r
-                                                               return userDataElement.getAttribute(key);\r
+                                                               try {\r
+                                                                       userDataElement.load("TinyMCE");\r
+                                                                       return userDataElement.getAttribute(key);\r
+                                                               } catch (e) {\r
+                                                                       // Ignore, loading might fail if "Userdata Persistence" is disabled in IE\r
+                                                                       return null;\r
+                                                               }\r
                                                        },\r
 \r
                                                        removeItem : function(key) {\r
@@ -303,7 +312,7 @@
                                        return;\r
 \r
                                // Store contents if the contents if longer than the minlength of characters\r
-                               content = editor.getContent();\r
+                               content = editor.getContent({draft: true});\r
                                if (content.length > editor.settings.autosave_minlength) {\r
                                        expires = self.getExpDate();\r
 \r
@@ -326,7 +335,7 @@
                 * @method restoreDraft\r
                 */\r
                restoreDraft : function() {\r
-                       var self = this, storage = self.storage;\r
+                       var self = this, storage = self.storage, content;\r
 \r
                        if (storage) {\r
                                content = storage.getItem(self.key);\r