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

Merge pull request #6228 from svbergerem/refactor-publisher-js

Browse source 
Refactor publisher_view.js
This commit is contained in:
Jonne Haß 2015-07-22 20:59:07 +02:00
commit 2cede713b1
3 changed files with 84 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -41,6 +41,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) [#6130](https://github.com/diaspora/diaspora/pull/6130) [#6132](https://github.com/diaspora/diaspora/pull/6132)
* Use upstream CSS mappings for Entypo [#6158](https://github.com/diaspora/diaspora/pull/6158)
* Replace some mobile icons with Entypo [#6218](https://github.com/diaspora/diaspora/pull/6218)
* Refactor publisher backbone view [#6228](https://github.com/diaspora/diaspora/pull/6228)
## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

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

@ -251,20 +251,13 @@ app.views.Publisher = Backbone.View.extend({
return false;
},
createPostPreview : function(evt) {
if(evt){ evt.preventDefault(); }
//add missing mentions at end of post:
this.handleTextchange();
var serializedForm = $(evt.target).closest("form").serializeObject();
getUploadedPhotos: function() {
var photos = [];
$("li.publisher_photo img").each(function(){
$("li.publisher_photo img").each(function() {
var file = $(this).attr("src").substring("/uploads/images/".length);
photos.push(
{
"sizes":{
"sizes": {
"small" : "/uploads/images/thumb_small_" + file,
"medium" : "/uploads/images/thumb_medium_" + file,
"large" : "/uploads/images/scaled_full_" + file
@ -272,33 +265,36 @@ app.views.Publisher = Backbone.View.extend({
}
);
});
return photos;
},
var mentioned_people = [],
regexp = new RegExp("@{\(\[\^\;\]\+\); \(\[\^\}\]\+\)}", "g"),
getMentionedPeople: function(serializedForm) {
var mentionedPeople = [],
regexp = /@{([^;]+); ([^}]+)}/g,
user;
var getMentionedUser = function(handle) {
return Mentions.contacts.filter(function(user) {
return user.handle === handle;
})[0];
};
while( (user = regexp.exec(serializedForm["status_message[text]"])) ){
while( (user = regexp.exec(serializedForm["status_message[text]"])) ) {
// user[1]: name, user[2]: handle
var mentioned_user = getMentionedUser(user[2]);
if(mentioned_user){
mentioned_people.push({
"id":mentioned_user["id"],
"guid":mentioned_user["guid"],
"name":user[1],
"diaspora_id":user[2],
"avatar":mentioned_user["avatar"]
var mentionedUser = getMentionedUser(user[2]);
if(mentionedUser){
mentionedPeople.push({
"id": mentionedUser.id,
"guid": mentionedUser.guid,
"name": user[1],
"diaspora_id": user[2],
"avatar": mentionedUser.avatar
});
}
}
return mentionedPeople;
},
var date = (new Date()).toISOString();
getPollData: function(serializedForm) {
var poll;
var pollQuestion = serializedForm.poll_question;
var pollAnswersArray = _.flatten([serializedForm["poll_answers[]"]]);
@ -316,6 +312,21 @@ app.views.Publisher = Backbone.View.extend({
"participation_count": "0"
};
}
return poll;
},
createPostPreview : function(evt) {
if(evt){ evt.preventDefault(); }
if(!app.stream) { return; }
//add missing mentions at end of post:
this.handleTextchange();
var serializedForm = $(evt.target).closest("form").serializeObject();
var photos = this.getUploadedPhotos();
var mentionedPeople = this.getMentionedPeople(serializedForm);
var date = (new Date()).toISOString();
var poll = this.getPollData(serializedForm);
var previewMessage = {
"id" : 0,
@ -325,7 +336,7 @@ app.views.Publisher = Backbone.View.extend({
"interacted_at" : date,
"post_type" : "StatusMessage",
"author" : app.currentUser ? app.currentUser.attributes : {},
"mentioned_people" : mentioned_people,
"mentioned_people" : mentionedPeople,
"photos" : photos,
"frame_name" : "status",
"title" : serializedForm["status_message[text]"],
@ -333,12 +344,11 @@ app.views.Publisher = Backbone.View.extend({
"interactions" : {"likes":[],"reshares":[],"comments_count":0,"likes_count":0,"reshares_count":0},
"poll": poll
};
if(app.stream) {
this.removePostPreview();
app.stream.addNow(previewMessage);
this.recentPreview=previewMessage;
this.modifyPostPreview($(".stream_element:first",$(".stream_container")));
}
this.removePostPreview();
app.stream.addNow(previewMessage);
this.recentPreview=previewMessage;
this.modifyPostPreview($(".stream_element:first",$(".stream_container")));
},
modifyPostPreview : function(post) {
@ -346,17 +356,17 @@ app.views.Publisher = Backbone.View.extend({
$(".collapsible",post).removeClass("collapsed").addClass("opened");
$("a.delete.remove_post",post).hide();
$("a.like, a.focus_comment_textarea",post).removeAttr("href");
$("a.like",post).addClass("like_preview");
$("a.like",post).removeClass("like");
$("a.focus_comment_textarea",post).addClass("focus_comment_textarea_preview");
$("a.focus_comment_textarea",post).removeClass("focus_comment_textarea");
$("a.like",post).addClass("like_preview")
.removeClass("like");
$("a.focus_comment_textarea",post).addClass("focus_comment_textarea_preview")
.removeClass("focus_comment_textarea");
$("a",$("span.details.grey",post)).removeAttr("href");
},
removePostPreview : function() {
if(app.stream && this.recentPreview) {
app.stream.items.remove(this.recentPreview);
delete this.recentPreview;
app.stream.items.remove(this.recentPreview);
delete this.recentPreview;
}
},

36
spec/javascripts/app/views/publisher_view_spec.js
View file

@ -152,6 +152,42 @@ describe("app.views.Publisher", function() {
});
});
describe("createPostPreview", function(){
beforeEach(function() {
app.stream = { addNow: $.noop };
});
it("calls handleTextchange to complete missing mentions", function(){
spyOn(this.view, "handleTextchange");
this.view.createPostPreview($.Event());
expect(this.view.handleTextchange).toHaveBeenCalled();
});
it("calls removePostPreview to remove the last preview", function(){
spyOn(this.view, "removePostPreview");
this.view.createPostPreview($.Event());
expect(this.view.removePostPreview).toHaveBeenCalled();
});
it("adds the status message to the stream", function() {
spyOn(app.stream, "addNow");
this.view.createPostPreview($.Event());
expect(app.stream.addNow).toHaveBeenCalled();
});
it("sets recentPreview", function(){
expect(this.view.recentPreview).toBeUndefined();
this.view.createPostPreview($.Event());
expect(this.view.recentPreview).toBeDefined();
});
it("calls modifyPostPreview to apply the preview style to the post", function(){
spyOn(this.view, "modifyPostPreview");
this.view.createPostPreview($.Event());
expect(this.view.modifyPostPreview).toHaveBeenCalled();
});
});
describe('#setText', function() {
it("sets the content text", function() {
this.view.setText("FOO bar");