Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / TinyMCE / js / plugins / autosave / editor_plugin_src.js

diff --git a/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
index d8cc1120fa5bf38aa1e37505cdee859683dda108..061cf13519653d9ec4bd5bb30ae07ab479cd46b5 100644 (file)
--- a/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/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