Skip to content

Rename CMS.Views.Notification.Saving to Mini. #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peter-fogg merged 1 commit into from
Jul 11, 2013
Merged

Rename CMS.Views.Notification.Saving to Mini. #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cms/static/coffee/spec/views/feedback_spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ describe "CMS.Views.Prompt", ->
view.hide()
# expect($("body")).not.toHaveClass("prompt-is-shown")

describe "CMS.Views.Notification.Saving", ->
describe "CMS.Views.Notification.Mini", ->
beforeEach ->
@view = new CMS.Views.Notification.Saving()
@view = new CMS.Views.Notification.Mini()

it "should have minShown set to 1250 by default", ->
expect(@view.options.minShown).toEqual(1250)
Expand Down
2 changes: 1 addition & 1 deletion cms/static/coffee/spec/views/overview_spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe "Course Overview", ->
spyOn(window, 'saveSetSectionScheduleDate').andCallThrough()
# Have to do this here, as it normally gets bound in document.ready()
$('a.save-button').click(saveSetSectionScheduleDate)
@notificationSpy = spyOn(CMS.Views.Notification.Saving.prototype, 'show').andCallThrough()
@notificationSpy = spyOn(CMS.Views.Notification.Mini.prototype, 'show').andCallThrough()
window.analytics = jasmine.createSpyObj('analytics', ['track'])
window.course_location_analytics = jasmine.createSpy()
sinon.useFakeXMLHttpRequest()
Expand Down
2 changes: 1 addition & 1 deletion cms/static/coffee/spec/views/textbook_spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ describe "CMS.Views.ShowTextbook", ->
@xhr = sinon.useFakeXMLHttpRequest()
@xhr.onCreate = (xhr) -> requests.push(xhr)

@savingSpies = spyOnConstructor(CMS.Views.Notification, "Saving",
@savingSpies = spyOnConstructor(CMS.Views.Notification, "Mini",
["show", "hide"])
@savingSpies.show.andReturn(@savingSpies)

Expand Down
2 changes: 1 addition & 1 deletion cms/static/js/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ function saveSetSectionScheduleDate(e) {
'start': start
});

var saving = new CMS.Views.Notification.Saving({
var saving = new CMS.Views.Notification.Mini({
title: gettext("Saving") + "…",
maxShown: 1250
});
Expand Down
2 changes: 1 addition & 1 deletion cms/static/js/models/section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CMS.Models.Section = Backbone.Model.extend({
},
showNotification: function() {
if(!this.msg) {
this.msg = new CMS.Views.Notification.Saving({
this.msg = new CMS.Views.Notification.Mini({
title: gettext("Saving") + "…"
});
}
Expand Down
11 changes: 5 additions & 6 deletions cms/static/js/views/feedback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ CMS.Views.Prompt = CMS.Views.SystemFeedback.extend({
var capitalCamel, types, intents;
capitalCamel = _.compose(_.str.capitalize, _.str.camelize);
types = ["alert", "notification", "prompt"];
intents = ["warning", "error", "confirmation", "announcement", "step-required", "help", "saving"];
intents = ["warning", "error", "confirmation", "announcement", "step-required", "help", "mini"];
_.each(types, function(type) {
_.each(intents, function(intent) {
// "class" is a reserved word in Javascript, so use "klass" instead
Expand All @@ -187,8 +187,7 @@ _.each(types, function(type) {
});
});

// set more sensible defaults for Notification-Saving views
var savingOptions = CMS.Views.Notification.Saving.prototype.options;
savingOptions.minShown = 1250;
savingOptions.closeIcon = false;

// set more sensible defaults for Notification-Mini views
var miniOptions = CMS.Views.Notification.Mini.prototype.options;
miniOptions.minShown = 1250;
miniOptions.closeIcon = false;
4 changes: 2 additions & 2 deletions cms/static/js/views/textbook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CMS.Views.ShowTextbook = Backbone.View.extend({
text: gettext("Delete"),
click: function(view) {
view.hide();
var delmsg = new CMS.Views.Notification.Saving({
var delmsg = new CMS.Views.Notification.Mini({
title: gettext("Deleting") + "…"
}).show();
textbook.destroy({
Expand Down Expand Up @@ -121,7 +121,7 @@ CMS.Views.EditTextbook = Backbone.View.extend({
if(e && e.preventDefault) { e.preventDefault(); }
this.setValues();
if(!this.model.isValid()) { return; }
var saving = new CMS.Views.Notification.Saving({
var saving = new CMS.Views.Notification.Mini({
title: gettext("Saving") + "…"
}).show();
var that = this;
Expand Down