Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Cancel pending auto-save if manual save occurs

Browse source 
Closes #4309
This commit is contained in:
Jason Williams 2014-10-20 18:03:11 +00:00
parent 768e335735
commit 133aff0626
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ghost/admin/components/gh-codemirror.js
View file

@ -21,8 +21,7 @@ var onChangeHandler = function (cm, changeObj) {
cm.component.set('value', cm.getValue()); cm.component.set('value', cm.getValue());
// Send an action notifying a 5 second pause in typing/changes. component.sendAction('typingPause');
Ember.run.debounce(component, 'sendAction', 'typingPause', 3000);
}; };
var onScrollHandler = function (cm) { var onScrollHandler = function (cm) {

15
ghost/admin/mixins/editor-base-controller.js
View file

@ -194,9 +194,16 @@ var EditorControllerMixin = Ember.Mixin.create(MarkerManager, {
var status = this.get('willPublish') ? 'published' : 'draft', var status = this.get('willPublish') ? 'published' : 'draft',
prevStatus = this.get('status'), prevStatus = this.get('status'),
isNew = this.get('isNew'), isNew = this.get('isNew'),
autoSaveId = this.get('autoSaveId'),
self = this; self = this;
options = options || {}; options = options || {};
if(autoSaveId) {
Ember.run.cancel(autoSaveId);
this.set('autoSaveId', null);
}
self.notifications.closePassive(); self.notifications.closePassive();
// ensure an incomplete tag is finalised before save // ensure an incomplete tag is finalised before save
@ -296,13 +303,17 @@ var EditorControllerMixin = Ember.Mixin.create(MarkerManager, {
autoSave: function () { autoSave: function () {
if (this.get('model.isDraft')) { if (this.get('model.isDraft')) {
this.send('save', {silent: true, disableNProgress: true}); var autoSaveId;
autoSaveId = Ember.run.debounce(this, 'send', 'save', {silent: true, disableNProgress: true}, 3000);
this.set('autoSaveId', autoSaveId);
} }
}, },
autoSaveNew: function () { autoSaveNew: function () {
if (this.get('isNew')) { if (this.get('isNew')) {
this.send('autoSave'); this.send('save', {silent: true, disableNProgress: true});
} }
} }
} }