Skip to content

Commit ffdc18f

Browse files
committed
Undisable nProgress
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
1 parent 4756fab commit ffdc18f

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

core/client/assets/sass/lib/nprogress.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
#nprogress {
77
pointer-events: none;
88
-webkit-pointer-events: none;
9+
position: absolute;
10+
top: 0;
11+
left: 0;
12+
z-index: 800;
913
}
1014

1115
#nprogress .bar {

core/client/controllers/post-settings-menu.js

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
4343
return;
4444
}
4545

46-
model.save(this.get('saveOptions')).catch(function (errors) {
46+
model.save().catch(function (errors) {
4747
self.showErrors(errors);
4848
self.set('selectedAuthor', author);
4949
model.rollback();
@@ -65,8 +65,6 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
6565
.extend(Ember.PromiseProxyMixin)
6666
.create(deferred);
6767
}),
68-
//Changes in the PSM are too minor to warrant NProgress firing
69-
saveOptions: {disableNProgress: true},
7068
/**
7169
* The placeholder is the published date of the post,
7270
* or the current date if the pubdate has not been set.
@@ -192,7 +190,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
192190
return;
193191
}
194192

195-
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
193+
this.get('model').save().catch(function (errors) {
196194
self.showErrors(errors);
197195
self.get('model').rollback();
198196
});
@@ -271,12 +269,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
271269
return;
272270
}
273271

274-
return self.get('model').save(self.get('saveOptions'));
275-
}).then(function (changed) {
276-
if (changed) {
277-
self.showSuccess('Permalink successfully changed to <strong>' +
278-
self.get('slug') + '</strong>.');
279-
}
272+
return self.get('model').save();
280273
}).catch(function (errors) {
281274
self.showErrors(errors);
282275
self.get('model').rollback();
@@ -331,7 +324,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
331324
return;
332325
}
333326

334-
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
327+
this.get('model').save().catch(function (errors) {
335328
self.showErrors(errors);
336329
self.get('model').rollback();
337330
});
@@ -354,7 +347,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
354347
return;
355348
}
356349

357-
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
350+
this.get('model').save().catch(function (errors) {
358351
self.showErrors(errors);
359352
});
360353
},
@@ -376,7 +369,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
376369
return;
377370
}
378371

379-
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
372+
this.get('model').save().catch(function (errors) {
380373
self.showErrors(errors);
381374
});
382375
},
@@ -390,7 +383,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
390383
return;
391384
}
392385

393-
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
386+
this.get('model').save().catch(function (errors) {
394387
self.showErrors(errors);
395388
self.get('model').rollback();
396389
});
@@ -405,7 +398,7 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
405398
return;
406399
}
407400

408-
this.get('model').save(this.get('saveOptions')).catch(function (errors) {
401+
this.get('model').save().catch(function (errors) {
409402
self.showErrors(errors);
410403
self.get('model').rollback();
411404
});

0 commit comments

Comments
 (0)