nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use backbone for flash messages

Browse source
This commit is contained in:
augier 2015-09-11 22:57:11 +02:00
parent aab21be09d
commit c62927bf00
36 changed files with 261 additions and 342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/app.js
View file

@ -123,6 +123,7 @@ var app = {
});
app.sidebar = new app.views.Sidebar();
app.backToTop = new app.views.BackToTop({el: $(document)});
app.flashMessages = new app.views.FlashMessages({el: $("#flash-container")});
},
/* mixpanel wrapper function */

22
app/assets/javascripts/app/models/post/interactions.js
View file

@ -87,11 +87,7 @@ app.models.Post.Interactions = Backbone.Model.extend({
var self = this;
this.comments.make(text).fail(function () {
var flash = new Diaspora.Widgets.FlashMessages();
flash.render({
success: false,
notice: Diaspora.I18n.t("failed_to_post_message")
});
app.flashMessages.error(Diaspora.I18n.t("failed_to_post_message"));
}).done(function() {
self.trigger('change'); //updates after sync
});
@ -102,16 +98,11 @@ app.models.Post.Interactions = Backbone.Model.extend({
},
reshare : function(){
var interactions = this
, reshare = this.post.reshare()
, flash = new Diaspora.Widgets.FlashMessages();
var interactions = this;
reshare.save()
this.post.reshare().save()
.done(function(reshare) {
flash.render({
success: true,
notice: Diaspora.I18n.t("reshares.successful")
});
app.flashMessages.success(Diaspora.I18n.t("reshares.successful"));
interactions.reshares.add(reshare);
if (app.stream && /^\/(?:stream|activity|aspects)/.test(app.stream.basePath())) {
app.stream.addNow(reshare);
@ -119,10 +110,7 @@ app.models.Post.Interactions = Backbone.Model.extend({
interactions.trigger("change");
})
.fail(function(){
flash.render({
success: false,
notice: Diaspora.I18n.t("reshares.duplicate")
});
app.flashMessages.error(Diaspora.I18n.t("reshares.duplicate"));
});
app.instrument("track", "Reshare");

84
app/assets/javascripts/app/pages/profile.js
View file

@ -2,45 +2,47 @@
app.pages.Profile = app.views.Base.extend({
events: {
'click #block_user_button': 'blockPerson',
'click #unblock_user_button': 'unblockPerson'
"click #block_user_button": "blockPerson",
"click #unblock_user_button": "unblockPerson"
},
subviews: {
'#profile': 'sidebarView',
'.profile_header': 'headerView',
'#main_stream': 'streamView'
"#profile": "sidebarView",
".profile_header": "headerView",
"#main_stream": "streamView"
},
tooltipSelector: '.profile_button .profile-header-icon, .sharing_message_container',
tooltipSelector: ".profile_button .profile-header-icon, .sharing_message_container",
initialize: function(opts) {
if( !this.model ) {
this._populateModel(opts);
}
if( app.hasPreload('photos') )
this.photos = app.parsePreload('photos'); // we don't interact with it, so no model
if( app.hasPreload('contacts') )
this.contacts = app.parsePreload('contacts'); // we don't interact with it, so no model
if(app.hasPreload("photos")){
this.photos = app.parsePreload("photos");
}
if(app.hasPreload("contacts")){
this.contacts = app.parsePreload("contacts");
}
this.streamCollection = _.has(opts, 'streamCollection') ? opts.streamCollection : null;
this.streamViewClass = _.has(opts, 'streamView') ? opts.streamView : null;
this.streamCollection = _.has(opts, "streamCollection") ? opts.streamCollection : null;
this.streamViewClass = _.has(opts, "streamView") ? opts.streamView : null;
this.model.on('change', this.render, this);
this.model.on('sync', this._done, this);
this.model.on("change", this.render, this);
this.model.on("sync", this._done, this);
// bind to global events
var id = this.model.get('id');
app.events.on('person:block:'+id, this.reload, this);
app.events.on('person:unblock:'+id, this.reload, this);
app.events.on('aspect:create', this.reload, this);
app.events.on('aspect_membership:update', this.reload, this);
var id = this.model.get("id");
app.events.on("person:block:"+id, this.reload, this);
app.events.on("person:unblock:"+id, this.reload, this);
app.events.on("aspect:create", this.reload, this);
app.events.on("aspect_membership:update", this.reload, this);
},
_populateModel: function(opts) {
if( app.hasPreload('person') ) {
this.model = new app.models.Person(app.parsePreload('person'));
if( app.hasPreload("person") ) {
this.model = new app.models.Person(app.parsePreload("person"));
} else if(opts && opts.person_id) {
this.model = new app.models.Person({guid: opts.person_id});
this.model.fetch();
@ -50,14 +52,18 @@ app.pages.Profile = app.views.Base.extend({
},
sidebarView: function() {
if( !this.model.has('profile') ) return false;
if(!this.model.has("profile")){
return false;
}
return new app.views.ProfileSidebar({
model: this.model,
model: this.model
});
},
headerView: function() {
if( !this.model.has('profile') ) return false;
if(!this.model.has("profile")){
return false;
}
return new app.views.ProfileHeader({
model: this.model,
photos: this.photos,
@ -66,12 +72,14 @@ app.pages.Profile = app.views.Base.extend({
},
streamView: function() {
if( !this.model.has('profile') ) return false;
if(!this.model.has("profile")){
return false;
}
if( this.model.isBlocked() ) {
$('#main_stream').empty().html(
$("#main_stream").empty().html(
'<div class="dull">'+
Diaspora.I18n.t('profile.ignoring', {name: this.model.get('name')}) +
'</div>');
Diaspora.I18n.t("profile.ignoring", {name: this.model.get("name")}) +
"</div>");
return false;
}
@ -85,7 +93,7 @@ app.pages.Profile = app.views.Base.extend({
});
app.stream.fetch();
if( this.model.get('is_own_profile') ) {
if( this.model.get("is_own_profile") ) {
app.publisher = new app.views.Publisher({collection : app.stream.items});
}
@ -93,14 +101,13 @@ app.pages.Profile = app.views.Base.extend({
},
blockPerson: function() {
if( !confirm(Diaspora.I18n.t('ignore_user')) ) return;
if(!confirm(Diaspora.I18n.t("ignore_user"))){
return;
}
var block = this.model.block();
block.fail(function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18n.t('ignore_failed')
});
app.flashMessages.error(Diaspora.I18n.t("ignore_failed"));
});
return false;
@ -109,21 +116,18 @@ app.pages.Profile = app.views.Base.extend({
unblockPerson: function() {
var block = this.model.unblock();
block.fail(function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18.t('unblock_failed')
});
app.flashMessages.error(Diaspora.I18.t("unblock_failed"));
});
return false;
},
reload: function() {
this.$('#profile').addClass('loading');
this.$("#profile").addClass("loading");
this.model.fetch();
},
_done: function() {
this.$('#profile').removeClass('loading');
this.$("#profile").removeClass("loading");
}
});
// @license-end

22
app/assets/javascripts/app/views.js
View file

@ -105,16 +105,10 @@ app.views.Base = Backbone.View.extend({
var report = new app.models.Report();
report.save(data, {
success: function() {
Diaspora.page.flashMessages.render({
success: true,
notice: Diaspora.I18n.t('report.status.created')
});
app.flashMessages.success(Diaspora.I18n.t("report.status.created"));
},
error: function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18n.t('report.status.exists')
});
app.flashMessages.error(Diaspora.I18n.t("report.status.exists"));
}
});
},
@ -124,21 +118,17 @@ app.views.Base = Backbone.View.extend({
destroyModel: function(evt) {
evt && evt.preventDefault();
var self = this;
var url = this.model.urlRoot + '/' + this.model.id;
var url = this.model.urlRoot + "/" + this.model.id;
if( confirm(_.result(this, "destroyConfirmMsg")) ) {
this.$el.addClass('deleting');
this.$el.addClass("deleting");
this.model.destroy({ url: url })
.done(function() {
self.remove();
})
.fail(function() {
self.$el.removeClass('deleting');
var flash = new Diaspora.Widgets.FlashMessages();
flash.render({
success: false,
notice: Diaspora.I18n.t('failed_to_remove')
});
self.$el.removeClass("deleting");
app.flashMessages.error(Diaspora.I18n.t("failed_to_remove"));
});
}
},

10
app/assets/javascripts/app/views/aspect_create_view.js
View file

@ -52,18 +52,12 @@ app.views.AspectCreate = app.views.Base.extend({
self.modal.modal("hide");
app.events.trigger("aspect:create", aspectId);
Diaspora.page.flashMessages.render({
"success": true,
"notice": Diaspora.I18n.t("aspects.create.success", {"name": aspectName})
});
app.flashMessages.success(Diaspora.I18n.t("aspects.create.success", {"name": aspectName}));
});
aspect.on("error", function() {
self.modal.modal("hide");
Diaspora.page.flashMessages.render({
"success": false,
"notice": Diaspora.I18n.t("aspects.create.failure")
});
app.flashMessages.error(Diaspora.I18n.t("aspects.create.failure"));
});
return aspect.save();
}

6
app/assets/javascripts/app/views/aspect_membership_view.js
View file

@ -89,7 +89,7 @@ app.views.AspectMembership = app.views.AspectsDropdown.extend({
if( this.dropdown.find("li.selected").length === 0 ) {
var msg = Diaspora.I18n.t("aspect_dropdown.started_sharing_with", { "name": this._name() });
startSharing = true;
Diaspora.page.flashMessages.render({ "success": true, "notice": msg });
app.flashMessages.success(msg);
}
app.events.trigger("aspect_membership:create", {
@ -110,7 +110,7 @@ app.views.AspectMembership = app.views.AspectsDropdown.extend({
this.dropdown.closest('.aspect_membership_dropdown').removeClass('open'); // close the dropdown
var msg = Diaspora.I18n.t(msg_id, { 'name': this._name() });
Diaspora.page.flashMessages.render({ 'success':false, 'notice':msg });
app.flashMessages.error(msg);
},
// remove the membership with the given id
@ -143,7 +143,7 @@ app.views.AspectMembership = app.views.AspectsDropdown.extend({
if( this.dropdown.find("li.selected").length === 0 ) {
var msg = Diaspora.I18n.t("aspect_dropdown.stopped_sharing_with", { "name": this._name() });
stopSharing = true;
Diaspora.page.flashMessages.render({ "success": true, "notice": msg });
app.flashMessages.success(msg);
}
app.events.trigger("aspect_membership:destroy", {

5
app/assets/javascripts/app/views/contact_view.js
View file

@ -19,7 +19,6 @@ app.views.Contact = app.views.Base.extend({
},
postRenderTemplate: function() {
var self = this;
var dropdownEl = this.$('.aspect_membership_dropdown.placeholder');
if( dropdownEl.length === 0 ) {
return;
@ -54,7 +53,7 @@ app.views.Contact = app.views.Base.extend({
},
error: function(){
var msg = Diaspora.I18n.t("contacts.error_add", { "name": self.model.get("person").name });
Diaspora.page.flashMessages.render({ "success": false, "notice": msg });
app.flashMessages.error(msg);
}
});
},
@ -78,7 +77,7 @@ app.views.Contact = app.views.Base.extend({
},
error: function(){
var msg = Diaspora.I18n.t("contacts.error_remove", { "name": self.model.get("person").name });
Diaspora.page.flashMessages.render({ "success": false, "notice": msg });
app.flashMessages.error(msg);
}
});
}

20
app/assets/javascripts/app/views/feedback_view.js
View file

@ -11,13 +11,13 @@ app.views.Feedback = app.views.Base.extend({
"click .post_report" : "report",
"click .block_user" : "blockUser",
"click .hide_post" : "hidePost",
"click .hide_post" : "hidePost"
},
tooltipSelector : ".label",
initialize : function() {
this.model.interactions.on('change', this.render, this);
this.model.interactions.on("change", this.render, this);
this.initViews && this.initViews(); // I don't know why this was failing with $.noop... :(
},
@ -47,7 +47,7 @@ app.views.Feedback = app.views.Base.extend({
blockUser: function(evt) {
if(evt) { evt.preventDefault(); }
if(!confirm(Diaspora.I18n.t('ignore_user'))) { return; }
if(!confirm(Diaspora.I18n.t("ignore_user"))) { return; }
this.model.blockAuthor()
.done(function() {
@ -55,16 +55,13 @@ app.views.Feedback = app.views.Base.extend({
document.location.href = "/stream";
})
.fail(function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18n.t('hide_post_failed')
});
app.flashMessages.error(Diaspora.I18n.t("hide_post_failed"));
});
},
hidePost : function(evt) {
if(evt) { evt.preventDefault(); }
if(!confirm(Diaspora.I18n.t('hide_post'))) { return; }
if(!confirm(Diaspora.I18n.t("hide_post"))) { return; }
$.ajax({
url : "/share_visibilities/42",
@ -77,11 +74,8 @@ app.views.Feedback = app.views.Base.extend({
document.location.href = "/stream";
})
.fail(function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18n.t('ignore_post_failed')
});
app.flashMessages.error(Diaspora.I18n.t("ignore_post_failed"));
});
},
}
});
// @license-end

20
app/assets/javascripts/app/views/flash_messages_view.js Normal file
View file

@ -0,0 +1,20 @@
app.views.FlashMessages = app.views.Base.extend({
templateName: "flash_messages",
_flash: function(message, error){
this.presenter = {
message: message,
alertLevel: error ? "alert-danger" : "alert-success"
};
this.renderTemplate();
},
success: function(message){
this._flash(message, false);
},
error: function(message){
this._flash(message, true);
}
});

13
app/assets/javascripts/app/views/pod_entry_view.js
View file

@ -52,22 +52,15 @@ app.views.PodEntry = app.views.Base.extend({
},
recheckPod: function() {
var self = this,
flash = new Diaspora.Widgets.FlashMessages();
var self = this;
this.$el.addClass("checking");
this.model.recheck()
.done(function(){
flash.render({
success: true,
notice: Diaspora.I18n.t("admin.pods.recheck.success")
});
app.flashMessages.success(Diaspora.I18n.t("admin.pods.recheck.success"));
})
.fail(function(){
flash.render({
success: false,
notice: Diaspora.I18n.t("admin.pods.recheck.failure")
});
app.flashMessages.error(Diaspora.I18n.t("admin.pods.recheck.failure"));
})
.always(function(){
self.$el

2
app/assets/javascripts/app/views/publisher_view.js
View file

@ -215,7 +215,7 @@ app.views.Publisher = Backbone.View.extend({
app.publisher.trigger("publisher:error");
}
self.setInputEnabled(true);
Diaspora.page.flashMessages.render({ "success":false, "notice":resp.responseText });
app.flashMessages.error(resp.responseText);
self.setButtonsEnabled(true);
self.setInputEnabled(true);
}

12
app/assets/javascripts/app/views/single-post-viewer/single_post_moderation.js
View file

@ -1,7 +1,7 @@
app.views.SinglePostModeration = app.views.Feedback.extend({
templateName: "single-post-viewer/single-post-moderation",
className: 'control-icons',
className: "control-icons",
events: function() {
return _.defaults({
@ -19,7 +19,7 @@ app.views.SinglePostModeration = app.views.Feedback.extend({
renderPluginWidgets : function() {
app.views.Base.prototype.renderPluginWidgets.apply(this);
this.$('a').tooltip({placement: 'bottom'});
this.$("a").tooltip({placement: "bottom"});
},
authorIsCurrentUser: function() {
@ -28,7 +28,7 @@ app.views.SinglePostModeration = app.views.Feedback.extend({
destroyModel: function(evt) {
if(evt) { evt.preventDefault(); }
var url = this.model.urlRoot + '/' + this.model.id;
var url = this.model.urlRoot + "/" + this.model.id;
if (confirm(Diaspora.I18n.t("remove_post"))) {
this.model.destroy({ url: url })
@ -37,11 +37,7 @@ app.views.SinglePostModeration = app.views.Feedback.extend({
document.location.href = "/stream";
})
.fail(function() {
var flash = new Diaspora.Widgets.FlashMessages();
flash.render({
success: false,
notice: Diaspora.I18n.t('failed_to_remove')
});
app.flashMessages.error(Diaspora.I18n.t("failed_to_remove"));
});
}
},

20
app/assets/javascripts/app/views/stream_post_views.js
View file

@ -39,10 +39,10 @@ app.views.StreamPost = app.views.Post.extend({
".permalink"].join(", "),
initialize : function(){
var personId = this.model.get('author').id;
app.events.on('person:block:'+personId, this.remove, this);
var personId = this.model.get("author").id;
app.events.on("person:block:"+personId, this.remove, this);
this.model.on('remove', this.remove, this);
this.model.on("remove", this.remove, this);
//subviews
this.commentStreamView = new app.views.CommentStream({model : this.model});
this.oEmbedView = new app.views.OEmbed({model : this.model});
@ -85,14 +85,11 @@ app.views.StreamPost = app.views.Post.extend({
blockUser: function(evt){
if(evt) { evt.preventDefault(); }
if(!confirm(Diaspora.I18n.t('ignore_user'))) { return }
if(!confirm(Diaspora.I18n.t("ignore_user"))) { return }
this.model.blockAuthor()
.fail(function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18n.t('ignore_failed')
});
app.flashMessages.error(Diaspora.I18n.t("ignore_failed"));
});
},
@ -104,7 +101,7 @@ app.views.StreamPost = app.views.Post.extend({
hidePost : function(evt) {
if(evt) { evt.preventDefault(); }
if(!confirm(Diaspora.I18n.t('confirm_dialog'))) { return }
if(!confirm(Diaspora.I18n.t("confirm_dialog"))) { return }
var self = this;
$.ajax({
@ -117,10 +114,7 @@ app.views.StreamPost = app.views.Post.extend({
self.remove();
})
.fail(function() {
Diaspora.page.flashMessages.render({
success: false,
notice: Diaspora.I18n.t('hide_post_failed')
});
app.flashMessages.error(Diaspora.I18n.t("hide_post_failed"));
});
},

1
app/assets/javascripts/diaspora.js
View file

@ -70,7 +70,6 @@
$.extend(this, {
directionDetector: this.instantiate("DirectionDetector"),
events: function() { return Diaspora.page.eventsContainer.data("events"); },
flashMessages: this.instantiate("FlashMessages"),
header: this.instantiate("Header", body.find("header")),
timeAgo: this.instantiate("TimeAgo")
});

6
app/assets/javascripts/pages/users-getting-started.js
View file

@ -18,7 +18,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
/* flash message prompt */
var message = Diaspora.I18n.t("getting_started.hey", {'name': $("#profile_first_name").val()});
Diaspora.page.flashMessages.render({success: true, notice: message});
app.flashMessages.success(message);
});
$("#profile_first_name").bind("change", function(){
@ -45,7 +45,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
confirmation = confirm(confirmMessage);
}
Diaspora.page.flashMessages.render({success: true, notice: message});
app.flashMessages.success(message);
return confirmation;
});
@ -66,7 +66,7 @@ Diaspora.Pages.UsersGettingStarted = function() {
startText: "",
emptyText: "no_results",
selectionAdded: function(elem){tagFollowings.create({"name":$(elem[0]).text().substring(2)})},
selectionRemoved: function(elem){
selectionRemoved: function(elem){
tagFollowings.where({"name":$(elem[0]).text().substring(2)})[0].destroy();
elem.remove();
}

38
app/assets/javascripts/widgets/flash-messages.js
View file

@ -1,38 +0,0 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
(function() {
var FlashMessages = function() {
var self = this;
this.subscribe("widget/ready", function() {
self.animateMessages();
});
this.animateMessages = function() {
self.flashMessages().addClass("expose").delay(8000).fadeTo(200, 0.5);
};
this.render = function(result) {
self.flashMessages().removeClass("expose").remove();
$("<div/>", {
id: result.success ? "flash_notice" : "flash_error"
})
.html($("<div/>", {
'class': "message"
})
.text(result.notice))
.prependTo(document.body);
self.animateMessages();
};
this.flashMessages = function() {
return $("#flash_notice, #flash_error, #flash_alert");
};
};
Diaspora.Widgets.FlashMessages = FlashMessages;
})();
// @license-end

62
app/assets/stylesheets/_flash_messages.scss
View file

@ -1,50 +1,22 @@
#flash_notice,
#flash_alert,
#flash_error {
position : fixed;
#flash-body {
left: 0;
position: fixed;
text-align: center;
top: -100px;
z-index: 999;
top : -100px;
left : 0;
width : 100%;
text-align : center;
color: $text-dark-grey;
&.expose {
@include animation(expose, 10s)
}
.message {
box-shadow: 0 1px 4px rgba(0,0,0,0.8);
display : inline-block;
padding: 10px 12px;
min-width: 400px;
max-width: 800px;
color : #fff;
background-color : rgba(0,0,0,0.8);
border : 1px solid rgba(255,255,255,0.7);
border-radius: 6px;
width: 100%;
&.expose { @include animation(expose, 10s) }
#flash-message {
border-radius: 0;
box-shadow: $card-shadow;
display: inline-block;
font-weight: bold;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 13px;
}
}
#flash_notice {
.message {
color: $text-dark-grey;
background-color: #F4F899;
border-color: darken(#F4F899, 40%);
}
}
#flash_error,
#flash_alert {
.message {
background-color: #CA410B;
border-color: darken(#CA410B, 10%);
max-width: 800px;
min-width: 500px;
padding: 10px 12px;
&.alert-danger { border: 1px solid darken($state-danger-bg, 10%); }
&.alert-succes { border: 1px solid darken($state-success-bg, 10%); }
&.alert-warning { border: 1px solid darken($state-warning-bg, 10%); }
}
}

4
app/assets/stylesheets/mobile/mobile.scss
View file

@ -35,10 +35,6 @@ h3 { margin-top: 0; }
.clear { clear: both; }
#main { padding: 56px 10px 0 10px; }
.message {
padding-left: 2px;
}
.avatar {
border-radius: 4px;
}

5
app/assets/templates/flash_messages_tpl.jst.hbs Normal file
View file

@ -0,0 +1,5 @@
<div id="flash-body" class="expose">
<div id="flash-message" class="alert {{ alertLevel }}">
{{ message }}
</div>
</div>

11
app/helpers/layout_helper.rb
View file

@ -67,8 +67,15 @@ module LayoutHelper
def flash_messages
flash.map do |name, msg|
content_tag(:div, :id => "flash_#{name}") do
content_tag(:div, msg, :class => 'message')
klass = if name == "alert"
"warning"
elsif name == "error"
"danger"
else
"success"
end
content_tag(:div, msg, id: "flash-body", class: "expose") do
content_tag(:div, msg, id: "flash-message", class: "message alert alert-#{klass}")
end
end.join(' ').html_safe
end

10
app/helpers/sessions_helper.rb
View file

@ -1,6 +1,6 @@
module SessionsHelper
def prefilled_username
uri = Addressable::URI.parse(session['user_return_to'])
uri = Addressable::URI.parse(session["user_return_to"])
if uri && uri.query_values
uri.query_values["username"]
else
@ -9,10 +9,14 @@ module SessionsHelper
end
def display_registration_link?
AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != "registrations"
end
def display_password_reset_link?
devise_mapping.recoverable? && controller_name != 'passwords'
devise_mapping.recoverable? && controller_name != "passwords"
end
def flash_class(name)
{notice: "success", alert: "warning", error: "danger"}[name.to_sym]
end
end

2
app/views/conversations/create.js.erb
View file

@ -2,7 +2,7 @@ var response = <%= raw @response.to_json %>;
<% if session[:mobile_view] %>
window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
<% else %>
Diaspora.page.flashMessages.render({ 'success':response.success, 'notice':response.message });
app.flashMessages._flash(response.message, response.success);
if(response.success){
$("#new_conversation").removeClass('form_do_not_clear').clearForm();
window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";

4
app/views/layouts/application.html.haml
View file

@ -47,8 +47,6 @@
= include_gon(camel_case: true)
%body{ class: "page-#{controller_name} action-#{action_name}" }
= flash_messages
= yield :before_content
= content_for?(:content) ? yield(:content) : yield
@ -69,3 +67,5 @@
.entypo-cross
%a.play-pause
%ol.indicator
#flash-container= flash_messages

2
app/views/photos/_new_profile_photo.haml
View file

@ -38,7 +38,7 @@
/* flash message prompt */
var message = Diaspora.I18n.t("photo_uploader.looking_good");
Diaspora.page.flashMessages.render({success: true, notice: message});
app.flashMessages.success(message);
var id = responseJSON.data.photo.id;
var url = responseJSON.data.photo.unprocessed_image.url;

6
app/views/sessions/new.mobile.haml
View file

@ -9,10 +9,8 @@
#main_stream.stream
- flash.each do |name, msg|
%p{class: "login_#{name}"}
= msg
#flash_alert.expose
#session.message
.expose#flash-container
#flash-message{class: "message alert alert-#{flash_class name}"}
= msg
#login_form

2
app/views/tags/update.js.erb
View file

@ -1,3 +1,3 @@
var tagName = "<%= escape_javascript(@tag.name) %>"
$("#followed_tags_listing").find("#tag-following-"+tagName).slideUp(100);
Diaspora.page.flashMessages.render({success: true, notice: Diaspora.I18n.t("tags.wasnt_that_interesting", {tagName: tagName})});
app.flashMessages.success(Diaspora.I18n.t("tags.wasnt_that_interesting", {tagName: tagName}));

14
features/support/application_cuke_helpers.rb
View file

@ -1,14 +1,14 @@
module ApplicationCukeHelpers
def flash_message_success?
flash_message(selector: "notice").visible?
flash_message(selector: "success").visible?
end
def flash_message_failure?
flash_message(selector: "error").visible?
flash_message(selector: "danger").visible?
end
def flash_message_alert?
flash_message(selector: "alert").visible?
flash_message(selector: "warning").visible?
end
def flash_message_containing?(text)
@ -17,8 +17,8 @@ module ApplicationCukeHelpers
def flash_message(opts={})
selector = opts.delete(:selector)
selector &&= "#flash_#{selector}"
find(selector || '.message', {match: :first}.merge(opts))
selector &&= ".alert-#{selector}"
find(selector || "#flash-message", {match: :first}.merge(opts))
end
def confirm_form_validation_error(element)
@ -27,8 +27,8 @@ module ApplicationCukeHelpers
end
def check_fields_validation_error(field_list)
field_list.split(',').each do |f|
confirm_form_validation_error('input#'+f.strip)
field_list.split(",").each do |f|
confirm_form_validation_error("input##{f.strip}")
end
end

6
spec/javascripts/app/views/aspect_create_view_spec.js
View file

@ -62,6 +62,8 @@ describe("app.views.AspectCreate", function() {
describe("#createAspect", function() {
beforeEach(function() {
this.view.render();
this.view.$el.append($("<div id='flash-container'/>"));
app.flashMessages = new app.views.FlashMessages({ el: this.view.$("#flash-container") });
});
it("should send the correct name to the server", function() {
@ -115,7 +117,7 @@ describe("app.views.AspectCreate", function() {
it("should display a flash message", function() {
this.view.createAspect();
jasmine.Ajax.requests.mostRecent().respondWith(this.response);
expect($("[id^=\"flash\"]")).toBeSuccessFlashMessage(
expect(this.view.$("#flash-message")).toBeSuccessFlashMessage(
Diaspora.I18n.t("aspects.create.success", {name: "new name"})
);
});
@ -138,7 +140,7 @@ describe("app.views.AspectCreate", function() {
it("should display a flash message", function() {
this.view.createAspect();
jasmine.Ajax.requests.mostRecent().respondWith(this.response);
expect($("[id^=\"flash\"]")).toBeErrorFlashMessage(
expect(this.view.$("#flash-message")).toBeErrorFlashMessage(
Diaspora.I18n.t("aspects.create.failure")
);
});

10
spec/javascripts/app/views/aspect_membership_view_spec.js
View file

@ -6,6 +6,8 @@ describe("app.views.AspectMembership", function(){
// mock a dummy aspect dropdown
spec.loadFixture("aspect_membership_dropdown");
this.view = new app.views.AspectMembership({el: $('.aspect_membership_dropdown')});
this.view.$el.append($("<div id='flash-container'/>"));
app.flashMessages = new app.views.FlashMessages({ el: this.view.$("#flash-container") });
this.personId = $(".dropdown-menu").data("person_id");
this.personName = $(".dropdown-menu").data("person-short-name");
Diaspora.I18n.load({
@ -36,7 +38,7 @@ describe("app.views.AspectMembership", function(){
this.newAspect.trigger('click');
jasmine.Ajax.requests.mostRecent().respondWith(success);
expect($('[id^="flash"]')).toBeSuccessFlashMessage(
expect(this.view.$("#flash-message")).toBeSuccessFlashMessage(
Diaspora.I18n.t("aspect_dropdown.started_sharing_with", {name: this.personName})
);
});
@ -56,7 +58,7 @@ describe("app.views.AspectMembership", function(){
this.newAspect.trigger('click');
jasmine.Ajax.requests.mostRecent().respondWith(resp_fail);
expect($('[id^="flash"]')).toBeErrorFlashMessage(
expect(this.view.$("#flash-message")).toBeErrorFlashMessage(
Diaspora.I18n.t("aspect_dropdown.error", {name: this.personName})
);
});
@ -80,7 +82,7 @@ describe("app.views.AspectMembership", function(){
this.oldAspect.trigger('click');
jasmine.Ajax.requests.mostRecent().respondWith(success);
expect($('[id^="flash"]')).toBeSuccessFlashMessage(
expect(this.view.$("#flash-message")).toBeSuccessFlashMessage(
Diaspora.I18n.t("aspect_dropdown.stopped_sharing_with", {name: this.personName})
);
});
@ -100,7 +102,7 @@ describe("app.views.AspectMembership", function(){
this.oldAspect.trigger('click');
jasmine.Ajax.requests.mostRecent().respondWith(resp_fail);
expect($('[id^="flash"]')).toBeErrorFlashMessage(
expect(this.view.$("#flash-message")).toBeErrorFlashMessage(
Diaspora.I18n.t("aspect_dropdown.error_remove", {name: this.personName})
);
});

4
spec/javascripts/app/views/comment_stream_view_spec.js
View file

@ -32,6 +32,8 @@ describe("app.views.CommentStream", function(){
describe("createComment", function() {
beforeEach(function() {
this.view.render();
this.view.$el.append($("<div id='flash-container'/>"));
app.flashMessages = new app.views.FlashMessages({ el: this.view.$("#flash-container") });
this.view.expandComments();
});
@ -59,7 +61,7 @@ describe("app.views.CommentStream", function(){
this.request.respondWith({status: 500});
expect(this.view.$(".comment-content p").text()).not.toEqual("a new comment");
expect($('*[id^="flash"]')).toBeErrorFlashMessage("posting failed!");
expect(this.view.$("#flash-message")).toBeErrorFlashMessage("posting failed!");
});
});

74
spec/javascripts/app/views/contact_view_spec.js
View file

@ -5,7 +5,7 @@ describe("app.views.Contact", function(){
this.model = new app.models.Contact({
person_id: 42,
person: { id: 42, name: 'alice' },
person: { id: 42, name: "alice" },
aspect_memberships: [{id: 23, aspect: this.aspect1}]
});
this.view = new app.views.Contact({ model: this.model });
@ -24,32 +24,34 @@ describe("app.views.Contact", function(){
app.aspect = this.aspect1;
expect(this.view.presenter()).toEqual(jasmine.objectContaining({
person_id: 42,
person: jasmine.objectContaining({id: 42, name: 'alice'}),
person: jasmine.objectContaining({id: 42, name: "alice"}),
in_aspect: 'in_aspect'
}));
});
});
context('add contact to aspect', function() {
context("add contact to aspect", function() {
beforeEach(function() {
app.aspect = this.aspect2;
this.view.render();
this.button = this.view.$el.find('.contact_add-to-aspect');
this.contact = this.view.$el.find('.stream_element.contact');
this.view.$el.append($("<div id='flash-container'/>"));
app.flashMessages = new app.views.FlashMessages({ el: this.view.$("#flash-container") });
this.button = this.view.$el.find(".contact_add-to-aspect");
this.contact = this.view.$el.find(".stream_element.contact");
this.aspectMembership = {id: 42, aspect: app.aspect.toJSON()};
this.response = JSON.stringify(this.aspectMembership);
});
it('sends a correct ajax request', function() {
this.button.trigger('click');
it("sends a correct ajax request", function() {
this.button.trigger("click");
var obj = $.parseJSON(jasmine.Ajax.requests.mostRecent().params);
expect(obj.person_id).toBe(this.model.get('person_id'));
expect(obj.aspect_id).toBe(app.aspect.get('id'));
});
it('adds a aspect_membership to the contact', function() {
it("adds a aspect_membership to the contact", function() {
expect(this.model.aspectMemberships.length).toBe(1);
$('.contact_add-to-aspect',this.contact).trigger('click');
$(".contact_add-to-aspect",this.contact).trigger("click");
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200, // success
responseText: this.response
@ -70,9 +72,9 @@ describe("app.views.Contact", function(){
});
});
it('calls render', function() {
spyOn(this.view, 'render');
$('.contact_add-to-aspect',this.contact).trigger('click');
it("calls render", function() {
spyOn(this.view, "render");
$(".contact_add-to-aspect",this.contact).trigger("click");
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200, // success
responseText: this.response
@ -81,40 +83,39 @@ describe("app.views.Contact", function(){
});
it('displays a flash message on errors', function(){
$('.contact_add-to-aspect',this.contact).trigger('click');
it("displays a flash message on errors", function(){
$(".contact_add-to-aspect",this.contact).trigger("click");
jasmine.Ajax.requests.mostRecent().respondWith({
status: 400, // fail
status: 400 // fail
});
expect($('[id^="flash"]')).toBeErrorFlashMessage(
Diaspora.I18n.t(
'contacts.error_add',
{name: this.model.get('person').name}
)
expect(this.view.$("#flash-message")).toBeErrorFlashMessage(
Diaspora.I18n.t( "contacts.error_add", {name: this.model.get("person").name} )
);
});
});
context('remove contact from aspect', function() {
context("remove contact from aspect", function() {
beforeEach(function() {
app.aspect = this.aspect1;
this.view.render();
this.button = this.view.$el.find('.contact_remove-from-aspect');
this.contact = this.view.$el.find('.stream_element.contact');
this.view.$el.append($("<div id='flash-container'/>"));
app.flashMessages = new app.views.FlashMessages({ el: this.view.$("#flash-container") });
this.button = this.view.$el.find(".contact_remove-from-aspect");
this.contact = this.view.$el.find(".stream_element.contact");
this.aspectMembership = this.model.aspectMemberships.first().toJSON();
this.response = JSON.stringify(this.aspectMembership);
});
it('sends a correct ajax request', function() {
$('.contact_remove-from-aspect',this.contact).trigger('click');
it("sends a correct ajax request", function() {
$(".contact_remove-from-aspect",this.contact).trigger("click");
expect(jasmine.Ajax.requests.mostRecent().url).toBe(
"/aspect_memberships/"+this.aspectMembership.id
);
});
it('removes the aspect_membership from the contact', function() {
it("removes the aspect_membership from the contact", function() {
expect(this.model.aspectMemberships.length).toBe(1);
$('.contact_remove-from-aspect',this.contact).trigger('click');
$(".contact_remove-from-aspect",this.contact).trigger("click");
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200, // success
responseText: this.response
@ -135,9 +136,9 @@ describe("app.views.Contact", function(){
});
});
it('calls render', function() {
spyOn(this.view, 'render');
$('.contact_remove-from-aspect',this.contact).trigger('click');
it("calls render", function() {
spyOn(this.view, "render");
$(".contact_remove-from-aspect",this.contact).trigger("click");
jasmine.Ajax.requests.mostRecent().respondWith({
status: 200, // success
responseText: this.response,
@ -145,16 +146,13 @@ describe("app.views.Contact", function(){
expect(this.view.render).toHaveBeenCalled();
});
it('displays a flash message on errors', function(){
$('.contact_remove-from-aspect',this.contact).trigger('click');
it("displays a flash message on errors", function(){
$(".contact_remove-from-aspect",this.contact).trigger("click");
jasmine.Ajax.requests.mostRecent().respondWith({
status: 400, // fail
status: 400 // fail
});
expect($('[id^="flash"]')).toBeErrorFlashMessage(
Diaspora.I18n.t(
'contacts.error_remove',
{name: this.model.get('person').name}
)
expect(this.view.$("#flash-message")).toBeErrorFlashMessage(
Diaspora.I18n.t( "contacts.error_remove", {name: this.model.get("person").name})
);
});
});

4
spec/javascripts/app/views/conversations_view_spec.js
View file

@ -4,8 +4,8 @@ describe("app.views.Conversations", function(){
beforeEach(function() {
spec.loadFixture("conversations_unread");
// select second conversation that is still unread
$(".conversation-wrapper > .conversation.selected").removeClass("selected")
$(".conversation-wrapper > .conversation.unread").addClass("selected")
$(".conversation-wrapper > .conversation.selected").removeClass("selected");
$(".conversation-wrapper > .conversation.unread").addClass("selected");
});
it("removes the unread class from the conversation", function() {

33
spec/javascripts/app/views/flash_messages_view-spec.js Normal file
View file

@ -0,0 +1,33 @@
describe("app.views.FlashMessages", function(){
var flashMessages = new app.views.FlashMessages();
describe("flash", function(){
it("call _flash with correct parameters", function() {
spyOn(flashMessages, "_flash");
flashMessages.success("success!");
expect(flashMessages._flash).toHaveBeenCalledWith("success!", false);
flashMessages.error("error!");
expect(flashMessages._flash).toHaveBeenCalledWith("error!", true);
});
});
describe("render", function(){
beforeEach(function(){
spec.content().html("<div id='flash-container'/>");
flashMessages = new app.views.FlashMessages({ el: $("#flash-container") });
});
it("renders a success message", function(){
flashMessages.success("success!");
expect(flashMessages.$("#flash-body")).toHaveClass("expose");
expect($("#flash-message")).toHaveClass("alert-success");
expect($("#flash-message").text().trim()).toBe("success!");
});
it("renders an error message", function(){
flashMessages.error("error!");
expect(flashMessages.$("#flash-body")).toHaveClass("expose");
expect($("#flash-message")).toHaveClass("alert-danger");
expect($("#flash-message").text().trim()).toBe("error!");
});
});
});

9
spec/javascripts/app/views/pod_entry_view_spec.js
View file

@ -57,6 +57,11 @@ describe("app.views.PodEntry", function() {
describe("recheckPod", function() {
var ajaxSuccess = { status: 200, responseText: "{}" };
var ajaxFail = { status: 400 };
beforeEach(function(){
this.view.render();
this.view.$el.append($("<div id='flash-container'/>"));
app.flashMessages = new app.views.FlashMessages({ el: this.view.$("#flash-container") });
});
it("calls .recheck() on the model", function() {
spyOn(this.pod, "recheck").and.returnValue($.Deferred());
@ -67,13 +72,13 @@ describe("app.views.PodEntry", function() {
it("renders a success flash message", function() {
this.view.recheckPod();
jasmine.Ajax.requests.mostRecent().respondWith(ajaxSuccess);
expect($("[id^=\"flash\"]")).toBeSuccessFlashMessage();
expect(this.view.$("#flash-message")).toBeSuccessFlashMessage();
});
it("renders an error flash message", function() {
this.view.recheckPod();
jasmine.Ajax.requests.mostRecent().respondWith(ajaxFail);
expect($("[id^=\"flash\"]")).toBeErrorFlashMessage();
expect(this.view.$("#flash-message")).toBeErrorFlashMessage();
});
it("sets the appropriate CSS class", function() {

23
spec/javascripts/helpers/SpecHelper.js
View file

@ -3,15 +3,12 @@
var realXMLHttpRequest = window.XMLHttpRequest;
// matches flash messages with success/error and contained text
var flashMatcher = function(flash, id, text) {
var flashMatcher = function(flash, klass, text) {
var textContained = true;
if( text ) {
textContained = (flash.text().indexOf(text) !== -1);
if(text) {
textContained = (flash.text().trim().indexOf(text) !== -1);
}
return flash.is(id) &&
flash.hasClass('expose') &&
textContained;
return flash.hasClass(klass) && flash.parent().hasClass("expose") && textContained;
};
// information for jshint
@ -24,7 +21,7 @@ var customMatchers = {
return {
compare: function(actual, expected) {
var result = {};
result.pass = flashMatcher(actual, '#flash_notice', expected);
result.pass = flashMatcher(actual, "alert-success", expected);
return result;
}
};
@ -33,7 +30,7 @@ var customMatchers = {
return {
compare: function(actual, expected) {
var result = {};
result.pass = flashMatcher(actual, '#flash_error', expected);
result.pass = flashMatcher(actual, "alert-danger", expected);
return result;
}
};
@ -55,7 +52,7 @@ beforeEach(function() {
var Page = Diaspora.Pages["TestPage"];
$.extend(Page.prototype, Diaspora.EventBroker.extend(Diaspora.BaseWidget));
Diaspora.I18n.load({}, 'en', {});
Diaspora.I18n.load({}, "en", {});
Diaspora.page = new Page();
Diaspora.page.publish("page/ready", [$(document.body)]);
@ -147,12 +144,12 @@ spec.clearLiveEventBindings = function() {
};
spec.content = function() {
return $('#jasmine_content');
return $("#jasmine_content");
};
// Loads fixure markup into the DOM as a child of the jasmine_content div
spec.loadFixture = function(fixtureName) {
var $destination = $('#jasmine_content');
var $destination = $("#jasmine_content");
// get the markup, inject it into the dom
$destination.html(spec.fixtureHtml(fixtureName));
@ -179,7 +176,7 @@ spec.fixtureHtml = function(fixtureName) {
spec.retrieveFixture = function(fixtureName) {
// construct a path to the fixture, including a cache-busting timestamp
var path = '/tmp/js_dom_fixtures/' + fixtureName + ".fixture.html?" + new Date().getTime();
var path = "/tmp/js_dom_fixtures/" + fixtureName + ".fixture.html?" + new Date().getTime();
var xhr;
// retrieve the fixture markup via xhr request to jasmine server

36
spec/javascripts/widgets/flash-messages-spec.js
View file

@ -1,36 +0,0 @@
describe("Diaspora", function() {
describe("Widgets", function() {
describe("FlashMessages", function() {
var flashMessages;
describe("animateMessages", function() {
beforeEach(function() {
flashMessages = Diaspora.BaseWidget.instantiate("FlashMessages");
$("#jasmine_content").html(
'<div id="flash_notice">' +
'flash message' +
'</div>'
);
});
it("is called when the DOM is ready", function() {
spyOn(flashMessages, "animateMessages").and.callThrough();
flashMessages.publish("widget/ready");
expect(flashMessages.animateMessages).toHaveBeenCalled();
});
});
describe("render", function() {
it("creates a new div for the message and calls flashes.animateMessages", function() {
spyOn(flashMessages, "animateMessages");
flashMessages.render({
success: true,
message: "success!"
});
expect($("#flash_notice").length).toEqual(1);
expect(flashMessages.animateMessages).toHaveBeenCalled();
});
});
});
});
});