TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 13:54:35 +03:00
Code Issues Projects Releases Wiki Activity

Undisable nProgress

Browse Source 
Closes #4095

* Removes the line that killed nProgress for PSM
* adds to styles to make nProgress appear again (ht @halfdan)

IRC: http://107.20.237.151:8081/logs/%23ghost/20140922#pm51214
This commit is contained in:
Gabor Javorszky 2014-09-22 18:17:09 +01:00
parent f941cd064f
commit 058edb96c8
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghost/admin/assets/sass/lib/nprogress.scss
View File

@ -6,6 +6,10 @@
#nprogress {
pointer-events: none;
-webkit-pointer-events: none;
position: absolute;
top: 0;
left: 0;
z-index: 800;
}
#nprogress .bar {

23
ghost/admin/controllers/post-settings-menu.js
View File

@ -43,7 +43,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
model.save(this.get('saveOptions')).catch(function (errors) {
model.save().catch(function (errors) {
self.showErrors(errors);
self.set('selectedAuthor', author);
model.rollback();
@ -65,8 +65,6 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
.extend(Ember.PromiseProxyMixin)
.create(deferred);
}),
//Changes in the PSM are too minor to warrant NProgress firing
saveOptions: {disableNProgress: true},
/**
* The placeholder is the published date of the post,
* or the current date if the pubdate has not been set.
@ -192,7 +190,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
this.get('model').save().catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
});
@ -271,12 +269,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
return self.get('model').save(self.get('saveOptions'));
}).then(function (changed) {
if (changed) {
self.showSuccess('Permalink successfully changed to <strong>' +
self.get('slug') + '</strong>.');
}
return self.get('model').save();
}).catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
@ -331,7 +324,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
this.get('model').save().catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
});
@ -354,7 +347,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
this.get('model').save().catch(function (errors) {
self.showErrors(errors);
});
},
@ -376,7 +369,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
this.get('model').save().catch(function (errors) {
self.showErrors(errors);
});
},
@ -390,7 +383,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
this.get('model').save().catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
});
@ -405,7 +398,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
return;
}
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
this.get('model').save().catch(function (errors) {
self.showErrors(errors);
self.get('model').rollback();
});