Merge pull request #667 from eos87/BK-2174

BK-2174 Turn off autosave by default in editor to avoid saving revisi…
booktype · Mar 2, 2017 · ab7de16 · ab7de16
2 parents fe42346 + 511ac27
commit ab7de16
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/lib/booktype/apps/edit/static/edit/js/booktype/edit.js b/lib/booktype/apps/edit/static/edit/js/booktype/edit.js
@@ -332,13 +332,13 @@
       });
 
       // Autosave chapter
-      if (win.booktype.editor.data.settings.config.edit.autosave.enabled) {
+      if (win.booktype.editor.autosave.enabled) {
         setInterval(function () {
           var $editor = Aloha.getEditableById('contenteditor');
           if (!_.isUndefined($editor) && $editor && $editor.isModified()) {
             win.booktype.editor.edit.saveContent({minor: true})
           }
-        }, win.booktype.editor.data.settings.config.edit.autosave.delay * 1000);
+        }, win.booktype.editor.autosave.delay * 1000);
       }
 
       // Tabs

diff --git a/lib/booktype/apps/edit/static/edit/js/booktype/editor.js b/lib/booktype/apps/edit/static/edit/js/booktype/editor.js
@@ -76,10 +76,6 @@
             'TABLE': ['horizontalline', 'pbreak', 'indent-left', 'indent-right'],
             'PRE': ['insertImage', 'insertLink', 'horizontalline', 'pbreak', 'indent-left', 'indent-right'],
             'ALL': ['insertImage', 'insertLink', 'horizontalline', 'pbreak', 'indent-left', 'indent-right']
-          },
-          'autosave': {
-            'enabled': true,
-            'delay': 10
           }
         },
         'media': {

diff --git a/lib/booktype/apps/edit/templates/edit/edit_config.html b/lib/booktype/apps/edit/templates/edit/edit_config.html
@@ -17,6 +17,7 @@
       window.booktype.sputnikDispatcherURL = "{% url 'sputnik_dispatcher' %}";
       window.booktype.activeProfile = "{{ ACTIVE_PROFILE }}";
       window.booktype.editor.historyURL = "{% url 'edit:history' book.url_title %}";
+      window.booktype.editor.autosave = {{ autosave|safe }}
       window.booktype.bookSettingsURL = "{% url 'edit:settings' book.url_title %}";
 
       var settings = {

diff --git a/lib/booktype/apps/edit/views.py b/lib/booktype/apps/edit/views.py
@@ -463,6 +463,11 @@ def get_context_data(self, **kwargs):
         context['is_owner'] = book.owner == self.request.user
         context['publish_options'] = config.get_configuration('PUBLISH_OPTIONS')
 
+        context['autosave'] = json.dumps({
+            'enabled': config.get_configuration('EDITOR_AUTOSAVE_ENABLED'),
+            'delay': config.get_configuration('EDITOR_AUTOSAVE_DELAY')
+        })
+
         return context
 
     def get_login_url(self):

diff --git a/lib/booktype/constants.py b/lib/booktype/constants.py
@@ -120,6 +120,12 @@
 MOBI_DOCUMENT_WIDTH = 2480
 EPUB_DOCUMENT_WIDTH = 2480
 
+# editor stuff here
+EDITOR_AUTOSAVE_ENABLED = False  # disabled by default
+EDITOR_AUTOSAVE_DELAY = 60  # time in seconds
+
+# end editor stuff
+
 EPUB_NOT_ALLOWED_TAGS = (
     # 'strip' - drop tag, leave content
     # 'drop' - drop tag, drop content