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

Merge pull request #4313 from jaswilli/issue-4309

Browse source 
Cancel pending auto-save if manual save occurs.
This commit is contained in:
Hannah Wolfe 2014-10-20 22:11:28 +03:00
commit 7e123c8665
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/client/components/gh-codemirror.js
View file

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

15
core/client/mixins/editor-base-controller.js
View file

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

4
core/test/functional/base.js
View file

@ -247,7 +247,7 @@ casper.on('remote.message', function (msg) {
// output any errors
casper.on('error', function (msg, trace) {
casper.echoConcise('ERROR, ' + msg, 'ERROR');
if (trace) {
if (trace && trace[0]) {
casper.echoConcise('file: ' + trace[0].file, 'WARNING');
casper.echoConcise('line: ' + trace[0].line, 'WARNING');
casper.echoConcise('function: ' + trace[0]['function'], 'WARNING');
@ -258,7 +258,7 @@ casper.on('error', function (msg, trace) {
// output any page errors
casper.on('page.error', function (msg, trace) {
casper.echoConcise('PAGE ERROR: ' + msg, 'ERROR');
if (trace) {
if (trace && trace[0]) {
casper.echoConcise('file: ' + trace[0].file, 'WARNING');
casper.echoConcise('line: ' + trace[0].line, 'WARNING');
casper.echoConcise('function: ' + trace[0]['function'], 'WARNING');

1
package.json
View file

@ -69,6 +69,7 @@
"devDependencies": {
"blanket": "~1.1.6",
"bower": "~1.3.10",
"ember-template-compiler": "1.7.0",
"grunt": "~0.4.5",
"grunt-cli": "~0.1.13",
"grunt-autoprefixer": "1.0.1",