diff --git a/Gemfile b/Gemfile index dd9bf93a2..cfc1fd7df 100644 --- a/Gemfile +++ b/Gemfile @@ -95,14 +95,14 @@ gem "entypo-rails", "3.0.0" # JavaScript gem "handlebars_assets", "0.23.8" -gem "jquery-rails", "4.3.5" +gem "jquery-rails", "4.4.0" gem "jquery-ui-rails", "5.0.5" gem "js-routes", "1.4.9" gem "js_image_paths", "0.1.1" gem "sprockets-es6", "0.9.2" source "https://gems.diasporafoundation.org" do - gem "rails-assets-jquery", "3.4.1" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery", "3.5.1" # Should be kept in sync with jquery-rails gem "rails-assets-highlightjs", "9.12.0" gem "rails-assets-markdown-it", "8.4.2" diff --git a/Gemfile.lock b/Gemfile.lock index 2daf7ebb7..06caa0084 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,7 @@ GEM rake jasmine-core (3.7.1) jasmine-jquery-rails (2.0.3) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -554,7 +554,7 @@ GEM rails-assets-jasmine (3.4.0) rails-assets-jasmine-ajax (4.0.0) rails-assets-jasmine (~> 3) - rails-assets-jquery (3.4.1) + rails-assets-jquery (3.5.1) rails-assets-jquery-placeholder (2.3.1) rails-assets-jquery (>= 1.6) rails-assets-jquery-textchange (0.2.3) @@ -828,7 +828,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 3.7.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.3.5) + jquery-rails (= 4.4.0) jquery-ui-rails (= 5.0.5) js-routes (= 1.4.9) js_image_paths (= 0.1.1) @@ -874,7 +874,7 @@ DEPENDENCIES rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! rails-assets-jasmine-ajax (= 4.0.0)! - rails-assets-jquery (= 3.4.1)! + rails-assets-jquery (= 3.5.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery.are-you-sure (= 1.9.0)! diff --git a/app/assets/javascripts/app/views/hovercard_view.js b/app/assets/javascripts/app/views/hovercard_view.js index 72ebe121a..9fe895bfe 100644 --- a/app/assets/javascripts/app/views/hovercard_view.js +++ b/app/assets/javascripts/app/views/hovercard_view.js @@ -130,7 +130,7 @@ app.views.Hovercard = app.views.Base.extend({ // set hashtags this.hashtags.empty(); this.hashtags.html($(_.map(person.profile.tags, function(tag) { - return $("", {href: Routes.tag(tag)}).text("#" + tag)[0]; + return $("", {href: Routes.tag(tag)}).text("#" + tag)[0]; }))); } }, diff --git a/app/assets/javascripts/app/views/locator.js b/app/assets/javascripts/app/views/locator.js index 364f3fa39..56de93746 100644 --- a/app/assets/javascripts/app/views/locator.js +++ b/app/assets/javascripts/app/views/locator.js @@ -19,7 +19,7 @@ app.views.Location = Backbone.View.extend({ var locator = new OSM.Locator(); locator.getAddress(function(address, latlng){ $(element).empty(); - $("", + $("", { id: "location_address", value: address, type: "text", diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js index 2549692ab..e435bbc23 100644 --- a/app/assets/javascripts/app/views/publisher_view.js +++ b/app/assets/javascripts/app/views/publisher_view.js @@ -351,7 +351,7 @@ app.views.Publisher = Backbone.View.extend({ }; var previewPost = new app.views.PreviewPost({model: new app.models.Post(previewMessage)}).render().el; - return $("
").append(previewPost).html(); + return $("
").append(previewPost).html(); }, keyDown : function(evt) { diff --git a/app/assets/javascripts/mobile/mobile_comments.js b/app/assets/javascripts/mobile/mobile_comments.js index 78dbe5e15..270799f7b 100644 --- a/app/assets/javascripts/mobile/mobile_comments.js +++ b/app/assets/javascripts/mobile/mobile_comments.js @@ -185,8 +185,8 @@ addNewComments: function(bottomBar, data) { if ($(".comment-container", bottomBar).length === 0) { - $(".show-comments", bottomBar).after($("
", {"class": "comment-container"})); - $(".comment-container", bottomBar).append($("