From 67653cf4651e2d3db9666a830bbe06b3a0842db8 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Tue, 28 Jul 2015 21:24:35 +0200 Subject: [PATCH] Update backbone.js closes #6262 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/assets/javascripts/app/router.js | 2 +- app/assets/javascripts/app/views/tags_view.js | 5 ++--- spec/javascripts/app/views/feedback_view_spec.js | 12 +++++++++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 6decfbf46..d64ac265f 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem "entypo-rails", "2.2.3" # 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" diff --git a/Gemfile.lock b/Gemfile.lock index 6fc2deccd..0dca4125c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 @@ -752,7 +752,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 (= 2.3.2.2) capybara (= 2.4.4) carrierwave (= 0.10.0) diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index 8cefd3f1a..e95e520e4 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -126,7 +126,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(); }, diff --git a/app/assets/javascripts/app/views/tags_view.js b/app/assets/javascripts/app/views/tags_view.js index cf13dbb49..e420281fb 100644 --- a/app/assets/javascripts/app/views/tags_view.js +++ b/app/assets/javascripts/app/views/tags_view.js @@ -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 diff --git a/spec/javascripts/app/views/feedback_view_spec.js b/spec/javascripts/app/views/feedback_view_spec.js index cc6b5da35..18f093fe6 100644 --- a/spec/javascripts/app/views/feedback_view_spec.js +++ b/spec/javascripts/app/views/feedback_view_spec.js @@ -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")); }); });