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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-07-29 10:06:04 +02:00
commit 4abc0c5988
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -86,7 +86,7 @@ gem "entypo-rails", "3.0.0.pre.rc2"
# JavaScript
gem "backbone-on-rails", "1.1.2.1"
gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.20.2"
gem "jquery-rails", "4.0.4"
gem "jquery-ui-rails", "5.0.5"

4
Gemfile.lock
View file

@ -60,7 +60,7 @@ GEM
autoprefixer-rails (5.2.1)
execjs
json
backbone-on-rails (1.1.2.1)
backbone-on-rails (1.2.0.0)
eco
ejs
jquery-rails
@ -774,7 +774,7 @@ DEPENDENCIES
addressable (= 2.3.8)
asset_sync (= 1.1.0)
autoprefixer-rails (= 5.2.1)
backbone-on-rails (= 1.1.2.1)
backbone-on-rails (= 1.2.0.0)
bootstrap-sass (= 3.3.5)
bootstrap-switch-rails (= 3.3.3)
capybara (= 2.4.4)

2
app/assets/javascripts/app/router.js
View file

@ -132,7 +132,7 @@ app.Router = Backbone.Router.extend({
{tagText: decodeURIComponent(name).toLowerCase()}
);
$("#author_info").prepend(followedTagsAction.render().el);
app.tags = new app.views.Tags({tagName: name});
app.tags = new app.views.Tags({hashtagName: name});
}
this._hideInactiveStreamLists();
},

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

@ -1,9 +1,8 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.views.Tags = Backbone.View.extend({
initialize: function() {
app.publisher.setText("#"+ this.tagName + " ");
initialize: function(opts) {
app.publisher.setText("#"+ opts.hashtagName + " ");
}
});
// @license-end

12
spec/javascripts/app/views/feedback_view_spec.js
View file

@ -60,13 +60,19 @@ describe("app.views.Feedback", function(){
});
it("allows for unliking a just-liked post", function(){
var responseText = JSON.stringify({"author": this.userAttrs});
var ajax_success = { status: 201, responseText: responseText };
expect(this.link().text()).toContain(Diaspora.I18n.t("stream.like"));
this.link().click();
jasmine.Ajax.requests.mostRecent().respondWith(ajax_success);
jasmine.Ajax.requests.mostRecent().respondWith({
status: 201,
responseText: JSON.stringify({
id: 42,
guid: 42,
author: this.userAttrs
})
});
expect(this.link().text()).toContain(Diaspora.I18n.t("stream.unlike"));
this.link().click();
jasmine.Ajax.requests.mostRecent().respondWith({status: 204});
expect(this.link().text()).toContain(Diaspora.I18n.t("stream.like"));
});
});